新建订单，新建合同里的经销商逻辑查询调整

src/custom/restcontroller/webmanage/sale/contract/Contract2.java

@@ -439,6 +439,7 @@ public class Contract2 extends Controller {
                 "erpagentnum");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where);
+        querySQL.setWhere("t1.sa_agentsid in (SELECT sa_agentsid from sys_enterprise_tradefield WHERE siteid='"+siteid+"')");
         querySQL.setPage(pageSize, pageNumber);
         querySQL.setOrderBy("t1.createdate desc");
         Rows rows = querySQL.query();

src/custom/restcontroller/webmanage/sale/order/Order2.java

@@ -572,7 +572,7 @@ public class Order2 extends Controller {
                 where.append(")");
             }
         }
-        where.append(" and t1.status !='作废' ");
+        where.append(" and t1.status ='启用' ");
 
         Long sa_customersid = content.getLong("sa_customersid");
         if (sa_customersid == 0) {
@@ -597,6 +597,7 @@ public class Order2 extends Controller {
         }
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where);
+        querySQL.setWhere("t1.sa_agentsid in (SELECT sa_agentsid from sys_enterprise_tradefield WHERE siteid='"+siteid+"')");
         querySQL.setPage(pageSize, pageNumber);
         querySQL.setOrderBy("t1.createdate desc");
         Rows rows = querySQL.query();