|
@@ -265,28 +265,6 @@ public class WmTeamController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * 根据id查询
|
|
|
|
- *
|
|
|
|
- * @param id
|
|
|
|
- * @return
|
|
|
|
- */
|
|
|
|
- @GetMapping("/{id}")
|
|
|
|
- public R<WmTeam> getById(@PathVariable("id") Integer id) {
|
|
|
|
- WmTeam team = wmTeamService.getById(id);
|
|
|
|
- if (team != null) {
|
|
|
|
- if (ArrayUtil.isNotEmpty(team.getLeader())) {
|
|
|
|
- List<SysUser> leaderList = sysUserMapper.selectBatchIds(CollectionUtil.toList(team.getLeader()));
|
|
|
|
- team.setLeaderName(leaderList.stream().map(SysUser::getRealname).toArray(String[]::new));
|
|
|
|
- }
|
|
|
|
- if (ArrayUtil.isNotEmpty(team.getMember())) {
|
|
|
|
- List<SysUser> memberList = sysUserMapper.selectBatchIds(CollectionUtil.toList(team.getMember()));
|
|
|
|
- team.setMemberName(memberList.stream().map(SysUser::getRealname).toArray(String[]::new));
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- return R.ok(team);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 查询团队列表
|
|
* 查询团队列表
|
|
*
|
|
*
|
|
@@ -339,30 +317,6 @@ public class WmTeamController {
|
|
return R.ok(teamManagePage);
|
|
return R.ok(teamManagePage);
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * 查询团队名称
|
|
|
|
- *
|
|
|
|
- * @param deptId
|
|
|
|
- * @return
|
|
|
|
- */
|
|
|
|
- @GetMapping("/list-team-name/{deptId}")
|
|
|
|
- public R<?> listTeamNameByDeptId(@PathVariable("deptId") Integer deptId) {
|
|
|
|
- List<WmTeam> list = wmTeamService.list(Wrappers.<WmTeam>lambdaQuery()
|
|
|
|
- .eq(WmTeam::getDeptId, deptId)
|
|
|
|
- .eq(WmTeam::getDelFlag, DelEnum.NOT_DEL.val())
|
|
|
|
- .eq(WmTeam::getEnableFlag, EnableEnum.ENABLE.val()));
|
|
|
|
- if (CollectionUtil.isNotEmpty(list)) {
|
|
|
|
- List<Map<String, Object>> mapList = list.stream().map(wmTeam -> {
|
|
|
|
- Map<String, Object> teamMap = MapUtil.newHashMap(2);
|
|
|
|
- teamMap.put("name", wmTeam.getName());
|
|
|
|
- teamMap.put("id", wmTeam.getId());
|
|
|
|
- return teamMap;
|
|
|
|
- }).collect(Collectors.toList());
|
|
|
|
- return R.ok(mapList);
|
|
|
|
- }
|
|
|
|
- return R.ok(new ArrayList<>());
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 查询团队可选择人员
|
|
* 查询团队可选择人员
|
|
*
|
|
*
|