diff --git a/src/main/java/io/company/localhost/controller/common/UserController.java b/src/main/java/io/company/localhost/controller/common/UserController.java index 604463e..5ee4e07 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -206,13 +206,16 @@ public class UserController { */ @ParameterCheck @GetMapping("/allUserList") - public ApiResponse> getallUserList() { + public ApiResponse getallUserList() { List allUserList = netmemberservice.getallUserList(); - return ApiResponse.ok(allUserList); + MemberVo user = AuthUtil.getUser(); + + MapDto outData = new MapDto(); + outData.put("allUserList", allUserList); + outData.put("user", user); + return ApiResponse.ok(outData); } - - @Guest @GetMapping("get1") public ApiResponse getAuthTest1() { diff --git a/src/main/resources/mapper/netmemberMapper.xml b/src/main/resources/mapper/netmemberMapper.xml index e79edec..25c68d5 100644 --- a/src/main/resources/mapper/netmemberMapper.xml +++ b/src/main/resources/mapper/netmemberMapper.xml @@ -94,17 +94,23 @@ FROM netmember WHERE MEMBERIDS = #{memberIds} - +