群列表查询添加一个查询不等于某个类型的条件，

供需列表查修复获取聊天数据

src/dsb/com/cnd3b/restcontroller/customer/supplyanddemand/SQL/供需详情查询_对话框列表.sql

@@ -1,4 +1,4 @@
-select t1.timdialogid, t1.createdate,  t2.fname, t2.funreadmsgcount, t1.fdatastatus
+select t1.timdialogid, t1.createdate,  t2.fname, t2.funreadmsgcount, t1.fdatastatus,t1.ownerid
 from timdialog t1
          inner join timdialogusers t2 on t1.siteid = t2.siteid and t1.timdialogid = t2.timdialogid
         -- inner join tenterprise_users t3 on t2.siteid = t3.siteid and t2.tenterprise_userid = t3.tenterprise_userid

src/dsb/com/cnd3b/restcontroller/customer/supplyanddemand/SQL/即时通讯群最新消息查询.sql

@@ -5,4 +5,4 @@ where siteid=$siteid$ and timdialogid in $timdialogid$ and tenterprise_userid =
 group by siteid,timdialogid
 )t2 on t1.siteid=t2.siteid and t1.timdialogid=t2.timdialogid and t1.timdialogmessageid=t2.timdialogmessageid
 left join timdialogusers t3 on t1.siteid=t3.siteid and t1.timdialogid=t3.timdialogid and t1.tenterprise_userid=t3.tenterprise_userid
-where t1.ownertable='tsupplyanddemand'
+--where t1.ownertable='tsupplyanddemand'

src/dsb/com/cnd3b/restcontroller/customer/supplyanddemand/supplyanddemand.java

@@ -61,7 +61,7 @@ public class supplyanddemand extends Controller {
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter_SQL("where", where);
 
-        System.err.println(sqlFactory.getSQL());
+//        System.err.println(sqlFactory.getSQL());
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
         RowsMap attinfoRowsMap = getAttachmentUrl("tsupplyanddemand", rows.toArrayList("tsupplyanddemandid"));
 
@@ -70,7 +70,8 @@ public class supplyanddemand extends Controller {
         dialoglistSQL.addParameter("siteid", siteid);
         dialoglistSQL.addParameter("userid", userid);
         dialoglistSQL.addParameter_in("tsupplyanddemandid", rows.toArrayList("tsupplyanddemandid"));
-        System.err.println(dialoglistSQL.getSQL());
+//        String sql = dialoglistSQL.getSQL();
+//        System.err.println(sql);
 
         Rows dialogrows = dbConnect.runSqlQuery(dialoglistSQL.getSQL());
 
@@ -78,7 +79,8 @@ public class supplyanddemand extends Controller {
         timnewmsgSQL.addParameter("siteid", siteid);
         timnewmsgSQL.addParameter("userid", userid);
         timnewmsgSQL.addParameter_in("timdialogid", dialogrows.toArrayList("timdialogid"));
-        System.err.println(timnewmsgSQL.getSQL());
+//        String sql2 = timnewmsgSQL.getSQL();
+//        System.err.println(sql2);
         RowsMap newmsgmap = timnewmsgSQL.runSqlQuery().toRowsMap("timdialogid");
         for (Row drow : dialogrows) {
             Rows newmsgrows = newmsgmap.get(drow.getString("timdialogid"));
@@ -96,7 +98,7 @@ public class supplyanddemand extends Controller {
         RowsMap map = dialogrows.toRowsMap("ownerid");
 
         for (Row row : rows) {
-            System.err.println("row:"+row.getString("tsupplyanddemandid"));
+//            System.err.println("row:"+row.getString("tsupplyanddemandid"));
             row.put("imdialogs", map.get(row.getString("tsupplyanddemandid")));
             //¸½¼þÐÅÏ¢
             row.put("attinfos", attinfoRowsMap.get(row.getString("tsupplyanddemandid")));

src/dsb/com/cnd3b/restcontroller/system/im/imdialog/imdialog.java

@@ -52,6 +52,12 @@ public class imdialog extends Controller {
                 where.append("t1.fimdialogtype ='").append(whereObject.getString("fimdialogtype")).append("' ");
                 where.append(")");
             }
+            //fimdialogtype2：不等于这个类型的
+            if (whereObject.containsKey("fimdialogtype2") && !"".equals(whereObject.getString("fimdialogtype2"))) {
+                where.append(" and(");
+                where.append("t1.fimdialogtype !='").append(whereObject.getString("fimdialogtype2")).append("' ");
+                where.append(")");
+            }
         }
         SQLFactory timdialogSQL = new SQLFactory(this, "即时通讯普通群列表查询");
         timdialogSQL.addParameter("siteid", siteid);