浏览代码

fix: chenyong cannot see chang and zhao

shc 9 月之前
父节点
当前提交
4a12877df0

+ 16 - 18
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -370,7 +370,21 @@ public class SysImplementPlanManager {
         }
         }
         // 平台||营销中心(查询全部)
         // 平台||营销中心(查询全部)
         else {
         else {
-            wrapper.eq(SysImplementPlan::getParentId, 0);
+
+            List<Long> ignored = new LinkedList<>();
+            ignored.add(-1019330L);
+            ignored.add(-1019986L);
+            ignored.add(1716964676L);
+            ignored.add(1716953432L);
+            ignored.add(-1020826L);
+            ignored.add(-1026289L);
+            ignored.add(-1026537L);
+
+            Integer userId = user.getId();
+            boolean ignoredFlag = userId == 7959 || userId == 7602;
+            wrapper.eq(SysImplementPlan::getParentId, 0)
+                    .notIn(ignoredFlag, SysImplementPlan::getConsignorId, ignored)
+                    .notIn(ignoredFlag, SysImplementPlan::getConsigneeId, ignored);
         }
         }
 
 
         if (ArrayUtil.isNotEmpty(period) && period.length == 2) {
         if (ArrayUtil.isNotEmpty(period) && period.length == 2) {
@@ -394,23 +408,7 @@ public class SysImplementPlanManager {
         List<Long> areaIds = userAreaService.listUserAreas(Long.valueOf(userId));
         List<Long> areaIds = userAreaService.listUserAreas(Long.valueOf(userId));
 
 
         // 获取可见范围中所有企业的信息
         // 获取可见范围中所有企业的信息
-        List<Long> entIds = enterpriseAreaService.listAreaEnts(areaIds);
-
-        if ((userId == 7959 || userId == 7602) && CollUtil.isNotEmpty(entIds)) {
-
-            List<Long> ignored = new LinkedList<>();
-            ignored.add(-1019330L);
-            ignored.add(-1019986L);
-            ignored.add(1716964676L);
-            ignored.add(1716953432L);
-            ignored.add(-1020826L);
-            ignored.add(-1026289L);
-            ignored.add(-1026537L);
-            entIds.removeAll(ignored);
-
-        }
-
-        return entIds;
+        return enterpriseAreaService.listAreaEnts(areaIds);
     }
     }
 
 
     /**
     /**