Merge remote-tracking branch 'origin/develop' into develop

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

@@ -61,8 +61,10 @@ public class supplyanddemand extends Controller {
         }
         SQLFactory sqlFactory;
         if (fstatus.equals("对接中")) {
+            sort = "t4.createdate desc,t1.tsupplyanddemandid desc";
             sqlFactory = new SQLFactory(this, "供需列表查询_对接中", pageSize, pageNumber, sort);
         } else {
+            sort = "t1.createdate desc,t1.tsupplyanddemandid desc";
             sqlFactory = new SQLFactory(this, "供需列表查询", pageSize, pageNumber, sort);
         }
 
@@ -221,6 +223,7 @@ public class supplyanddemand extends Controller {
                 where.append(" and t1.fissupply =").append(whereObject.getBooleanValue("fissupply") ? 1 : 0);
             }
         }
+        sort= "t1.fstatus,t1.tsupplyanddemandid desc";
         SQLFactory sqlFactory = new SQLFactory(this, "我的供需列表查询", pageSize, pageNumber, sort);
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("tagentsid", tagentsid);