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