diff --git a/src/main/java/com/tenlion/twoduty/controller/api/departmentbase/departmentBaseController.java b/src/main/java/com/tenlion/twoduty/controller/api/departmentbase/departmentBaseController.java index cb945cd..9dc3d8a 100644 --- a/src/main/java/com/tenlion/twoduty/controller/api/departmentbase/departmentBaseController.java +++ b/src/main/java/com/tenlion/twoduty/controller/api/departmentbase/departmentBaseController.java @@ -53,7 +53,8 @@ public class departmentBaseController extends DefaultBaseController { private IRoleUserService roleUserService; @Autowired private IUserService userService; - + @Autowired + private IPositionService positionService; /** @@ -116,9 +117,11 @@ public class departmentBaseController extends DefaultBaseController { return list; } List listUsers = roleUserService.listUserId(roleDTO.getRoleId()); - // List userIds = departmentUserService.listUserId(departmentId, listUsers); list = userService.listByUserIds(userIds); + for (UserDTO userDTO : list) { + + } return list; } @@ -134,6 +137,22 @@ public class departmentBaseController extends DefaultBaseController { return list; } + @ApiOperation(value = "用户详情", notes = "用户详情用户列表") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-by-user-id/{userId}") + public UserDTO getByUserId(@PathVariable("userId") String userId){ + UserDTO userDTO = userService.get(userId); + return userDTO; + } + + + + + + + + +