fix: 1.bc可以所有用户;2.bc创建csm选择角色问题

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysRoleController.java

@@ -174,7 +174,7 @@ public class SysRoleController {
 			List<Integer> CROAdmin = Stream.of(7,9,10).collect(Collectors.toList());
 			List<Integer> HCPAdmin = Stream.of(7,11,13).collect(Collectors.toList());
 			List<Integer> CFOAdmin = Stream.of(7).collect(Collectors.toList());
-			List<Integer> bcLeaderAdmin = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 34, 35).collect(Collectors.toList());
+			List<Integer> bcLeaderAdmin = Stream.of(2, 3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 34, 35).collect(Collectors.toList());
 			List<Integer> csmAdmin = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 34).collect(Collectors.toList());
 
 			Set<Integer> queryRoleIdSet = new HashSet<>();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -1127,7 +1127,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			userDTO.setRljCertStatus(null);
 		}
 
-		if (SecurityUtils.getRoles().contains(1) || SecurityUtils.getRoles().contains(2)) {
+		if (SecurityUtils.getRoles().contains(1) || SecurityUtils.getRoles().contains(2) || SecurityUtils.getRoles().contains(35)) {
 			return baseMapper.getUserVosPage(page, userDTO, new DataScope());
 		} else if (SecurityUtils.getRoles().contains(19)) {
 			// CSM只能查看自己维护的企业下的用户, 以及下属维护的企业下的用户
@@ -1136,20 +1136,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			Set<Integer> allUserIds = sysCsmUserRelationService.recurseCsmLowerUserId(Collections.singleton(userId), new AtomicInteger(10));
 			userDTO.setCsmUserIdList(allUserIds);
 			return baseMapper.getUserVosPage(page, userDTO, new DataScope());
-		} else if (SecurityUtils.getRoles().contains(35)) {
-			// BC总负责人数据权限
-			List<Integer> bcRoles = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 35).collect(Collectors.toList());
-			if (CollUtil.isNotEmpty(userDTO.getRole())) {
-				Collection<Integer> intersection = CollUtil.intersectionDistinct(bcRoles, userDTO.getRole());
-				if (CollUtil.isEmpty(intersection)) {
-					return page;
-				}
-				userDTO.setRole(new ArrayList<>(intersection));
-			} else {
-				userDTO.setRole(bcRoles);
-			}
-			return baseMapper.getUserVosPage(page, userDTO, new DataScope());
 		}
+//		else if (SecurityUtils.getRoles().contains(35)) {
+//			// BC总负责人数据权限
+//			List<Integer> bcRoles = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 35).collect(Collectors.toList());
+//			if (CollUtil.isNotEmpty(userDTO.getRole())) {
+//				Collection<Integer> intersection = CollUtil.intersectionDistinct(bcRoles, userDTO.getRole());
+//				if (CollUtil.isEmpty(intersection)) {
+//					return page;
+//				}
+//				userDTO.setRole(new ArrayList<>(intersection));
+//			} else {
+//				userDTO.setRole(bcRoles);
+//			}
+//			return baseMapper.getUserVosPage(page, userDTO, new DataScope());
+//		}
 		Integer deptId = userDTO.getDeptId();
 //		if (null != userDTO.getDeptId()) {
 //			deptId = userDTO.getDeptId();