隐患审核查询权限

huaxin-system/src/main/java/com/zehong/system/service/impl/TDangerServiceImpl.java

@@ -68,7 +68,7 @@ public class TDangerServiceImpl implements ITDangerService
      * 1.班长审核 2.部门经理审核 3.安全部审核 4.安全总监审核 5.常务副总审核 6.总经理审核结束
      */
     private final Map<String,String> approvalPermission = new HashMap<String,String>(){{
-        put("minister","2");
+        put("shengchanjingli","2");
         put("se","4");
         put("fuzong","5");
         put("manager","6");
@@ -331,15 +331,26 @@ public class TDangerServiceImpl implements ITDangerService
         // 1. 管理员条件
         TRectifyGroupMemberInfo queryParam = new TRectifyGroupMemberInfo();
         queryParam.setUserId(Long.valueOf(userInfo.getUserId()));
-        List<TRectifyGroupMemberInfo> memberInfoList = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(queryParam);
-        if (!CollectionUtils.isEmpty(memberInfoList)) {
-            boolean isAdmin = memberInfoList.stream().anyMatch(item -> "1".equals(item.getPost()));
-            if (isAdmin) {
-                List<Long> userIdList = memberInfoList.stream()
+        List<TRectifyGroupMemberInfo> userInfoList = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(queryParam);
+        if (!CollectionUtils.isEmpty(userInfoList)) {
+            List<Long> userIdList = new ArrayList<>();
+            for(TRectifyGroupMemberInfo user : userInfoList){
+                if("1".equals(user.getPost()) && null != user.getGroupId()){
+                    //查询组员信息
+                    TRectifyGroupMemberInfo teamQuery = new TRectifyGroupMemberInfo();
+                    teamQuery.setGroupId(user.getGroupId());
+                    teamQuery.setPost("2");
+                    List<TRectifyGroupMemberInfo> teamInfoList = tRectifyGroupMemberInfoMapper.selectTRectifyGroupMemberInfoList(teamQuery);
+                    //查询组员信息
+                    List<Long> teamUserIdList = teamInfoList.stream()
                             .map(TRectifyGroupMemberInfo::getUserId)
                             .filter(Objects::nonNull)
                             .distinct()
                             .collect(Collectors.toList());
+                    if(!CollectionUtils.isEmpty(teamUserIdList)) userIdList.addAll(teamUserIdList);
+                }
+
+            }
 
             if (!CollectionUtils.isEmpty(userIdList)) {
                 String userIds = userIdList.stream()
@@ -348,7 +359,6 @@ public class TDangerServiceImpl implements ITDangerService
                 conditions.add("(danger.admin_id IN (" + userIds + ") AND danger.approval_status = '1')");
             }
         }
-        }
 
         // 2. 部门条件
         if (userInfo != null && userInfo.getDept() != null && "安全管理部".equals(userInfo.getDept().getDeptName())) {
@@ -378,6 +388,7 @@ public class TDangerServiceImpl implements ITDangerService
         if (conditions.isEmpty()) {
             return "";
         }
+        if(conditions.size() == 1) return " AND " + conditions.get(0);
         return " AND (" + String.join(" OR ", conditions) + ")";
     }
 }