فهرست منبع

feat: 团队管理-查询可选择人员修改返回格式

lixuesong 3 سال پیش
والد
کامیت
fce638bb52

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTeamController.java

@@ -277,7 +277,7 @@ public class WmTeamController {
 			List<Map<String, Object>> mapList = list.stream().map(wmTeam -> {
 				Map<String, Object> teamMap = MapUtil.newHashMap(2);
 				teamMap.put("label", wmTeam.getName());
-				teamMap.put("value", wmTeam.getId());
+				teamMap.put("value", String.valueOf(wmTeam.getId()));
 				return teamMap;
 			}).collect(Collectors.toList());
 			resultList.addAll(mapList);

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

@@ -15,6 +15,7 @@ import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -68,6 +69,7 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 					userMap.put("realName", sysUser.getRealname());
 					userMap.put("phone", sysUser.getUsername());
 					userMap.put("userId", sysUser.getUserId());
+					userMap.put("isLeader", true);
 					return userMap;
 				}).collect(Collectors.toList());
 		// 未分配人员列表
@@ -78,6 +80,7 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 					userMap.put("realName", sysUser.getRealname());
 					userMap.put("phone", sysUser.getUsername());
 					userMap.put("userId", sysUser.getUserId());
+					userMap.put("isLeader", false);
 					return userMap;
 				}).collect(Collectors.toList());
 		// 已分配人员列表
@@ -88,6 +91,7 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 					userMap.put("realName", sysUser.getRealname());
 					userMap.put("phone", sysUser.getUsername());
 					userMap.put("userId", sysUser.getUserId());
+					userMap.put("isLeader", false);
 					return userMap;
 				}).collect(Collectors.toList());
 		// 已选择的人员(leader+member)
@@ -112,6 +116,8 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 					}).collect(Collectors.toList());
 			selectedMembers.add(0, leaderMap);
 			resultMap.put("selectedMembers", selectedMembers);
+		} else {
+			resultMap.put("selectedMembers", new ArrayList<>());
 		}
 		resultMap.put("leaders", leaderList);
 		resultMap.put("notAssignedMembers", notAssignedUserList);