fix: 团队管理-查询可选择的人员

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

@@ -111,28 +111,35 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 			WmTeam team = this.getById(teamId);
 			List<String> selectedLeaderIds = CollectionUtil.toList(team.getLeader());
 			List<String> selectedMemberIds = CollectionUtil.toList(team.getMember());
-			List<SysUser> selectedLeaderUsers = sysUserMapper.selectBatchIds(selectedLeaderIds);
-			List<Map<String, Object>> selectedLeaders = selectedLeaderUsers.stream()
-					.map(sysUser -> {
-						Map<String, Object> userMap = MapUtil.newHashMap(3);
-						userMap.put("realName", sysUser.getRealname());
-						userMap.put("phone", sysUser.getUsername());
-						userMap.put("userId", sysUser.getUserId());
-						userMap.put("isLeader", true);
-						return userMap;
-					}).collect(Collectors.toList());
-			List<SysUser> selectedMemberUsers = sysUserMapper.selectBatchIds(selectedMemberIds);
-			List<Map<String, Object>> selectedMembers = selectedMemberUsers.stream()
-					.map(sysUser -> {
-						Map<String, Object> userMap = MapUtil.newHashMap(3);
-						userMap.put("realName", sysUser.getRealname());
-						userMap.put("phone", sysUser.getUsername());
-						userMap.put("userId", sysUser.getUserId());
-						userMap.put("isLeader", false);
-						return userMap;
-					}).collect(Collectors.toList());
-			resultMap.put("selectedLeaders", selectedLeaders);
-			resultMap.put("selectedMembers", selectedMembers);
+			if (CollectionUtil.isNotEmpty(selectedLeaderIds)) {
+				List<SysUser> selectedLeaderUsers = sysUserMapper.selectBatchIds(selectedLeaderIds);
+				List<Map<String, Object>> selectedLeaders = selectedLeaderUsers.stream()
+						.map(sysUser -> {
+							Map<String, Object> userMap = MapUtil.newHashMap(3);
+							userMap.put("realName", sysUser.getRealname());
+							userMap.put("phone", sysUser.getUsername());
+							userMap.put("userId", sysUser.getUserId());
+							userMap.put("isLeader", true);
+							return userMap;
+						}).collect(Collectors.toList());
+				resultMap.put("selectedLeaders", selectedLeaders);
+			}
+			if (CollectionUtil.isNotEmpty(selectedMemberIds)) {
+				List<SysUser> selectedMemberUsers = sysUserMapper.selectBatchIds(selectedMemberIds);
+				List<Map<String, Object>> selectedMembers = selectedMemberUsers.stream()
+						.map(sysUser -> {
+							Map<String, Object> userMap = MapUtil.newHashMap(3);
+							userMap.put("realName", sysUser.getRealname());
+							userMap.put("phone", sysUser.getUsername());
+							userMap.put("userId", sysUser.getUserId());
+							userMap.put("isLeader", false);
+							return userMap;
+						}).collect(Collectors.toList());
+				resultMap.put("selectedMembers", selectedMembers);
+			} else {
+				resultMap.put("selectedLeaders", new ArrayList<>());
+				resultMap.put("selectedMembers", new ArrayList<>());
+			}
 			resultMap.put("teamName", team.getName());
 		} else {
 			resultMap.put("selectedLeaders", new ArrayList<>());