【普瑞】【合同/订单管理/业务下单/销售订单/安装确认】应用，经销商选择范围有问题

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

@@ -384,7 +384,7 @@ public class Order2 extends Controller {
             insertSQL.setValue("status", "新建");
             insertSQL.setValue("type", type);
             insertSQL.setValue("rec_contactsid", rec_contactsid);
-            insertSQL.setValue("sa_hospitaldepid",  content.getLongValue("sa_hospitaldepid"));
+            insertSQL.setValue("sa_hospitaldepid", content.getLongValue("sa_hospitaldepid"));
             sqlList.add(insertSQL.getSQL());
             sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "新建", "新建订单成功").getSQL());
         } else {
@@ -396,7 +396,7 @@ public class Order2 extends Controller {
             updateSQL.setValue("billdate", billdate);
             updateSQL.setValue("remarks", content.getStringValue("remarks"));
             updateSQL.setValue("rec_contactsid", rec_contactsid);
-            updateSQL.setValue("sa_hospitaldepid",  content.getLongValue("sa_hospitaldepid"));
+            updateSQL.setValue("sa_hospitaldepid", content.getLongValue("sa_hospitaldepid"));
             sqlList.add(updateSQL.getSQL());
             sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "编辑", "编辑订单成功").getSQL());
         }
@@ -439,7 +439,7 @@ public class Order2 extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_contacts", "t9", "t9.contactsid = t1.rec_contactsid and t9.siteid = t1.siteid",
                 "name", "province", "city", "county", "address");
         querySQL.addJoinTable(JOINTYPE.left, "sa_contract", "t10", "t10.sa_contractid = t1.sa_contractid and t10.siteid = t1.siteid");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_hospitaldep", "t11", "t11.sa_hospitaldepid = t1.sa_hospitaldepid and t11.siteid = t1.siteid","hospitaldepname");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_hospitaldep", "t11", "t11.sa_hospitaldepid = t1.sa_hospitaldepid and t11.siteid = t1.siteid", "hospitaldepname");
 
         querySQL.addQueryFields("hospitalname", "t3.enterprisename");
         querySQL.addQueryFields("agentname", "t5.enterprisename");
@@ -579,6 +579,7 @@ public class Order2 extends Controller {
         where.append(" and t1.status ='启用' ");
 
         Long sa_customersid = content.getLongValue("sa_customersid");
+        Long sa_hospitaldepid = content.getLongValue("sa_hospitaldepid");
         if (sa_customersid == 0) {
             //当前账号授权的，以及代理账号授权的经销商。
             ArrayList<Long> hrids = Proxy.getProxyHrids(this);
@@ -596,11 +597,15 @@ public class Order2 extends Controller {
                 "enterprisename", "province", "city", "county", "address");
 
         if (sa_customersid > 0) {
-            querySQL.setWhere("t1.sa_agentsid in (SELECT sa_agentsid from sa_agents_hospital WHERE sa_customersid=" + sa_customersid + " and siteid='" + siteid + "')");
+            if (sa_hospitaldepid > 0) {
+                querySQL.setWhere("t1.sa_agentsid in (SELECT sa_agentsid from sa_agents_hospital WHERE sa_customersid=" + sa_customersid + " and siteid='" + siteid + "' and sa_hospitaldepid=" + sa_hospitaldepid + ")");
+            } else {
+                querySQL.setWhere("t1.sa_agentsid in (SELECT sa_agentsid from sa_agents_hospital WHERE sa_customersid=" + sa_customersid + " and siteid='" + siteid + "')");
+            }
         }
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where);
-        querySQL.setWhere("t1.sa_agentsid in (SELECT sa_agentsid from sys_enterprise_tradefield WHERE siteid='"+siteid+"')");
+        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();
@@ -692,7 +697,7 @@ public class Order2 extends Controller {
         QuerySQL querySQ = SQLFactory.createQuerySQL(this, "sys_enterprise_tradefield", "*")
                 .setTableAlias("t1");
         querySQ.addJoinTable(JOINTYPE.left, "sys_hr", "t2", "t2.hrid=t1.hrid and t2.siteid=t1.siteid",
-                "name", "position", "hrcode", "phonenumber","userid");
+                "name", "position", "hrcode", "phonenumber", "userid");
         querySQ.addJoinTable(JOINTYPE.left, "sa_salearea", "t3", "t3.sa_saleareaid=t1.sa_saleareaid and t3.siteid=t1.siteid",
                 "areaname");
         querySQ.addJoinTable(JOINTYPE.left, "sys_department", "t4", "t4.departmentid=t2.departmentid and t4.siteid=t2.siteid",