bug修复

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

@@ -77,22 +77,23 @@ public class salearea2 extends Controller {
             sa_saleareaidsList.addAll(SaleArea.getSubSaleAreaIds(this, Long.parseLong(sa_saleareaid)));
         }
         boolean isExport = content.getBooleanValue("isExport");
-
-        if (userInfo.isSaler()) {
-            ArrayList<Long> saleAreaids = SaleArea.getSubSaleAreaIds(this, userInfo.getHrSaleAreaIds(hrid));
-            saleAreaids.addAll(userInfo.getHrSaleAreaIds(hrid));
-            saleAreaids.add(-1L);
+        if (sa_saleareaidsArray.size() > 0) {
+            if (userInfo.isSaler()) {
+                ArrayList<Long> saleAreaids = SaleArea.getSubSaleAreaIds(this, userInfo.getHrSaleAreaIds(hrid));
+                saleAreaids.addAll(userInfo.getHrSaleAreaIds(hrid));
+                saleAreaids.add(-1L);
+                if (sa_saleareaidsList.size() > 0) {
+                    String sqlStr = " and t1.sys_enterpriseid in (SELECT DISTINCT sys_enterpriseid from sys_enterprise_tradefield WHERE sa_saleareaid in " + saleAreaids + " )";
+                    sqlStr = sqlStr.replace("[", "(").replace("]", ")");
+                    where.append(sqlStr);
+                }
+            }
             if (sa_saleareaidsList.size() > 0) {
-                String sqlStr = " and t1.sys_enterpriseid in (SELECT DISTINCT sys_enterpriseid from sys_enterprise_tradefield WHERE sa_saleareaid in " + saleAreaids + " )";
+                String sqlStr = " and t1.sys_enterpriseid in (SELECT DISTINCT sys_enterpriseid from sys_enterprise_tradefield WHERE sa_saleareaid in " + sa_saleareaidsList + " )";
                 sqlStr = sqlStr.replace("[", "(").replace("]", ")");
                 where.append(sqlStr);
             }
         }
-        if (sa_saleareaidsList.size() > 0) {
-            String sqlStr = " and t1.sys_enterpriseid in (SELECT DISTINCT sys_enterpriseid from sys_enterprise_tradefield WHERE sa_saleareaid in " + sa_saleareaidsList + " )";
-            sqlStr = sqlStr.replace("[", "(").replace("]", ")");
-            where.append(sqlStr);
-        }
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents",
                         "sa_agentsid", "sys_enterpriseid", "gmname", "gmphonenumber", "agentnum", "cooperatetype", "remarks", "status", "createdate").