bug修复

src/custom/beans/CommonHepler.java

@@ -18,7 +18,7 @@ public class CommonHepler {
         }
         String sql = "SELECT DISTINCT t2.areaname,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
                 "INNER JOIN sa_salearea t2 ON t2.sa_saleareaid=t1.sa_saleareaid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
+                "WHERE t1.siteid='"+controller.siteid+"' and t1.sa_agentsid in " + sa_agentsids;
         sql = sql.replace("[", "(").replace("]", ")");
 
         return controller.dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
@@ -31,7 +31,7 @@ public class CommonHepler {
         }
         String sql = "SELECT DISTINCT t2.name,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
                 "INNER JOIN sys_hr t2 ON t2.hrid=t1.hrid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
+                "WHERE t1.siteid='"+controller.siteid+"' and t1.sa_agentsid in " + sa_agentsids;
         sql = sql.replace("[", "(").replace("]", ")");
 
         return controller.dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");

src/custom/restcontroller/webmanage/sale/salearea/SQL/查询经销商业务员.sql

@@ -0,0 +1,4 @@
+SELECT t1.sa_agentsid,GROUP_CONCAT(DISTINCT t2.NAME) salernames FROM sys_enterprise_tradefield t1
+INNER JOIN sys_hr t2 ON t2.hrid=t1.hrid
+WHERE t1.siteid=$siteid$
+GROUP BY sa_agentsid

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

@@ -49,6 +49,7 @@ public class salearea extends Controller {
                 where.append("or t2.county like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.address like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t3.erpagentnum like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t5.salernames like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
             if (whereObject.containsKey("startdate") && !"".equals(whereObject.getString("startdate"))) {
@@ -102,6 +103,9 @@ public class salearea extends Controller {
             }
         }
 
+        SQLFactory sqlFactory = new SQLFactory(this, "查询经销商业务员");
+        sqlFactory.addParameter("siteid",siteid);
+
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents",
                         "sa_agentsid", "sys_enterpriseid", "gmname", "gmphonenumber", "agentnum", "cooperatetype", "remarks", "status", "createdate", "scale", "mainproducts").
                 setTableAlias("t1");
@@ -111,6 +115,7 @@ 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.addJoinTable(JOINTYPE.left, sqlFactory, "t5", "t5.sa_agentsid = t1.sa_agentsid", "salernames");
         querySQL.addQueryFields("deletechangedate", "t4.changedate");
         querySQL.addQueryFields("deletechangeby", "t4.changeby");
         querySQL.setSiteid(siteid);
@@ -123,13 +128,13 @@ public class salearea extends Controller {
         Rows rows = querySQL.query();
 
         RowsMap areaRowsMap = CommonHepler.getAreaRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
-        RowsMap salerRowsMap = CommonHepler.getSalerNameRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
+//        RowsMap salerRowsMap = CommonHepler.getSalerNameRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
         for (Row row : rows) {
             row.put("p_c_c", row.getString("province") + "-" + row.getString("city") + "-" + row.getString("county"));
             Rows areaRows = areaRowsMap.getOrDefault(row.getString("sa_agentsid"), new Rows());
             row.put("areanames", StringUtils.join(areaRows.toArrayList("areaname"), ","));
-            Rows salerRows = salerRowsMap.getOrDefault(row.getString("sa_agentsid"), new Rows());
-            row.put("salernames", StringUtils.join(salerRows.toArrayList("name"), ","));
+//            Rows salerRows = salerRowsMap.getOrDefault(row.getString("sa_agentsid"), new Rows());
+//            row.put("salernames", StringUtils.join(salerRows.toArrayList("name"), ","));
         }
         return getSucReturnObject().setData(rows).toString();
     }