业务员档案

src/custom/restcontroller/webmanage/sale/salearea/salearea.java

@@ -104,7 +104,7 @@ public class salearea extends Controller {
         }
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents",
-                        "sa_agentsid", "sys_enterpriseid", "gmname", "gmphonenumber", "agentnum", "cooperatetype", "remarks", "status", "createdate","scale","mainproducts").
+                        "sa_agentsid", "sys_enterpriseid", "gmname", "gmphonenumber", "agentnum", "cooperatetype", "remarks", "status", "createdate", "scale", "mainproducts").
                 setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid",
                 "enterprisename", "province", "city", "county", "address");
@@ -112,8 +112,8 @@ public class salearea extends Controller {
                 "erpagentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t4", "t1.siteid = t4.siteid and t1.sa_agentsid = t4.ownerid and t4.ownertable = 'sa_agents'",
                 "deletereason");
-        querySQL.addQueryFields("deletechangedate","t4.changedate");
-        querySQL.addQueryFields("deletechangeby","t4.changeby");
+        querySQL.addQueryFields("deletechangedate", "t4.changedate");
+        querySQL.addQueryFields("deletechangeby", "t4.changeby");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where);
 
@@ -367,17 +367,21 @@ public class salearea extends Controller {
                 where.append("or t6.accountno like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if(whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))){
+            if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and(");
                 where.append("t1.status =").append(whereObject.getString("status")).append(" ");
                 where.append(")");
             }
         }
+        Long isHasSub = content.getLongValue("isHasSub");
 
         SQLFactory sqlFactory = new SQLFactory(this, "业务员列表查询", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter("siteid", siteid);
-//        ArrayList<Long> list = SaleArea.getSubSaleAreaIds(this, sa_saleareaid);
         ArrayList<Long> list = new ArrayList<>();
+        if (isHasSub == 1) {
+            list = SaleArea.getSubSaleAreaIds(this, sa_saleareaid);
+        }
+
         list.add(sa_saleareaid);
         sqlFactory.addParameter_in("sa_saleareaid", list);
         sqlFactory.addParameter_SQL("where", where);