9610 【普瑞】小程序【医院目标/经销商目标】医院/经销商查询问题：查不到下级区域的医院/经销商

src/custom/restcontroller/webmanage/sale/salestarget2/salestargetstatistics.java

@@ -1256,7 +1256,8 @@ public class salestargetstatistics extends Controller {
         where.append(" and ( t1.datastatus in (0,2) )");
 
 
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_customers", "sa_customersid", "createby", "createdate", "sys_enterpriseid", "status", "type", "tradingstatus", "datastatus", "billno", "province", "city", "county", "address", "stagename", "grade", "sa_saleareaid");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_customers", "sa_customersid", "createby", "createdate", "sys_enterpriseid", "status",
+                "type", "tradingstatus", "datastatus", "billno", "province", "city", "county", "address", "stagename", "grade", "sa_saleareaid");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t2.sys_enterpriseid = t1.sys_enterpriseid AND t2.siteid = t1.siteid", "enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "sa_salearea", "t3", "t3.sa_saleareaid = t1.sa_saleareaid AND t3.siteid = t1.siteid", "areaname");
@@ -1356,8 +1357,6 @@ public class salestargetstatistics extends Controller {
             }
         }
 
-        where.append(" and t1.status !='作废' ");
-
         JSONArray sa_saleareaidsArray = content.getJSONArray("sa_saleareaids");
         ArrayList<Long> sa_saleareaidsList = new ArrayList<>();
         for (Object o : sa_saleareaidsArray) {
@@ -1371,7 +1370,7 @@ public class salestargetstatistics extends Controller {
             sqlStr = sqlStr.replace("[", "(").replace("]", ")");
             where.append(sqlStr);
         } else {
-            String sqlStr = " and t1.sys_enterpriseid in (SELECT DISTINCT sys_enterpriseid from sys_enterprise_tradefield WHERE sa_saleareaid in " + getUserAreas() + " and hrid ='" + hrid + "' )";
+            String sqlStr = " and t1.sys_enterpriseid in (SELECT DISTINCT sys_enterpriseid from sys_enterprise_tradefield WHERE sa_saleareaid in " + getUserAreas() + " )";
             sqlStr = sqlStr.replace("[", "(").replace("]", ")");
             where.append(sqlStr);
         }
@@ -1389,7 +1388,7 @@ public class salestargetstatistics extends Controller {
         querySQL.addQueryFields("deletechangeby", "t4.changeby");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where);
-
+        querySQL.setWhere("t1.status ='启用'");
         querySQL.setPage(pageSize, pageNumber);
 
         querySQL.setOrderBy("t1.createdate desc");
@@ -1409,7 +1408,9 @@ public class salestargetstatistics extends Controller {
         ArrayList<Long> sa_saleareaids = rows.toArrayList("sa_saleareaid", new ArrayList<>());
         ArrayList<Long> subSaleAreaIds = SaleArea.getSubSaleAreaIds(this, sa_saleareaids);
         subSaleAreaIds.addAll(sa_saleareaids);
-        subSaleAreaIds.add(-1L);
+        if (subSaleAreaIds.size() == 0) {
+            subSaleAreaIds.add(-1L);
+        }
         return subSaleAreaIds;
     }