Explorar el Código

经销商详情查询sa_saleareaids调整

eganwu hace 3 años
padre
commit
14a1f435e4
Se han modificado 1 ficheros con 2 adiciones y 8 borrados
  1. 2 8
      src/custom/restcontroller/webmanage/sale/agents/agents.java

+ 2 - 8
src/custom/restcontroller/webmanage/sale/agents/agents.java

@@ -72,7 +72,7 @@ public class agents extends Controller {
         sqlFactory.addParameter("sa_agentsid", sa_agentsid);
         sqlFactory.addParameter("siteid", siteid);
         Rows agentRows = dbConnect.runSqlQuery(sqlFactory.getSQL());
-        Rows tradefieldidRows = dbConnect.runSqlQuery("select t1.sys_enterpriseid,t1.sa_agentsid,t1.sa_saleareaid,t1.tradefield,t3.areaname from sys_enterprise_tradefield t1  LEFT JOIN sa_salearea t3 ON t3.sa_saleareaid = t1.sa_saleareaid and t3.siteid = t1.siteid  where t1.siteid ='" + siteid + "'");
+        Rows tradefieldidRows = dbConnect.runSqlQuery("select t1.sys_enterpriseid,t1.sa_agentsid,t1.sa_saleareaid,t1.tradefield,t3.areaname,t3.sa_saleareaids from sys_enterprise_tradefield t1  LEFT JOIN sa_salearea t3 ON t3.sa_saleareaid = t1.sa_saleareaid and t3.siteid = t1.siteid  where t1.siteid ='" + siteid + "'");
         RowsMap rowsMap = tradefieldidRows.toRowsMap("sys_enterpriseid");
         for (Row agentRow : agentRows) {
             if (rowsMap.containsKey(agentRow.getString("sys_enterpriseid"))) {
@@ -81,13 +81,7 @@ public class agents extends Controller {
                     agentRow.put("tradefield", rows.toJsonArray("tradefield"));
                     agentRow.put("areaname", rows.toJsonArray("areaname"));
                     agentRow.put("sa_saleareaid", rows.get(0).getString("sa_saleareaid"));
-                    JSONArray sa_saleareaids = new JSONArray();
-                    for (Object obj : rows.toJsonArray("sa_saleareaid")) {
-                        if (!sa_saleareaids.contains(obj)) {
-                            sa_saleareaids.add(obj);
-                        }
-                    }
-                    agentRow.put("sa_saleareaids", sa_saleareaids);
+                    agentRow.put("sa_saleareaids", rows.get(0).getJSONArray("sa_saleareaids"));
                 }
             } else {
                 agentRow.put("tradefield", new JSONArray());