查询目标逻辑调整

src/custom/restcontroller/R.java

@@ -7778,6 +7778,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2026011315321602 {
+        public static class v1 {
+        }
+    }
 }
 
 

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

@@ -148,6 +148,26 @@ public class salestargetbill extends Controller {
             }
         }
 
+        ArrayList<Long> userIds = new ArrayList<>();
+        userIds.add(userid);
+        Rows hrrows = dbConnect.runSqlQuery("SELECT DISTINCT t1.ismanage FROM sys_hr t1 INNER JOIN sa_salearea_hr t2 ON t2.hrid=t1.hrid WHERE t1.userid=" + userid + " AND t1.siteid='" + siteid + "'");
+        if (hrrows.isNotEmpty()) {
+            Rows rows = dbConnect.runSqlQuery("SELECT DISTINCT t1.userid, t2.sa_saleareaid FROM sys_hr t1 INNER JOIN sa_salearea_hr t2 ON t2.hrid=t1.hrid WHERE t1.userid=" + userid + " AND t1.siteid='" + siteid + "'");
+            ArrayList<Long> sa_saleareaids = rows.toArrayList("sa_saleareaid", new ArrayList<>());
+            if (hrrows.get(0).getString("ismanage").equals("1")) {
+                userIds.addAll(rows.toArrayList("userid", new ArrayList<>()));
+            }
+            ArrayList<Long> sub_saleareaids = SaleArea.getSubSaleAreaIds(this, sa_saleareaids);
+            if (sub_saleareaids.size() > 0) {
+                QuerySQL querySQL = SQLFactory.createQuerySQL(dbConnect, "sys_hr", "userid");
+                querySQL.addJoinTable(JOINTYPE.inner, "sa_salearea_hr", "t2", "t2.hrid=t1.hrid");
+                querySQL.setSiteid(siteid);
+                querySQL.setWhere("t2.sa_saleareaid", sub_saleareaids);
+                Rows userrows = querySQL.query();
+                userIds.addAll(userrows.toArrayList("userid", new ArrayList<>()));
+            }
+        }
+
 
         SQLFactory sqlFactory = new SQLFactory(this, "查询任务量");
         sqlFactory.addParameter("siteid", siteid);
@@ -160,8 +180,8 @@ public class salestargetbill extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, sqlFactory, "t5", "t5.sa_salestargetbillid=t1.sa_salestargetbillid ",
                 "amount");
         querySQL.addQueryFields("hospitalname", "t3.enterprisename");
-        if (usertype == 1) {
-            querySQL.setWhere("createuserid", userid);
+        if (hrrows.isNotEmpty()) {
+            querySQL.setWhere("createuserid", userIds);
         }
 
         querySQL.setSiteid(siteid);