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 1a1151c..c70a63d 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -292,8 +292,8 @@ public class UserController { */ @ParameterCheck @GetMapping("/allUserList") - public ApiResponse getallUserList() { - List allUserList = netmemberservice.getallUserList(); + public ApiResponse selectallUserList() { + List allUserList = netmemberservice.selectallUserList(); MemberVo user = AuthUtil.getUser(); MapDto outData = new MapDto(); diff --git a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java index c3d6584..ec2ee5e 100644 --- a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java @@ -42,6 +42,6 @@ public interface NetmemberMapper { int updatePassword(MapDto map); - List getallUserList(); + List selectallUserList(); } diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java index a836f79..307e6f8 100644 --- a/src/main/java/io/company/localhost/service/NetmemberService.java +++ b/src/main/java/io/company/localhost/service/NetmemberService.java @@ -119,8 +119,8 @@ public class NetmemberService { * @param * @return */ - public List getallUserList() { - return memberMapper.getallUserList(); + public List selectallUserList() { + return memberMapper.selectallUserList(); } /** diff --git a/src/main/resources/mapper/NetmemberMapper.xml b/src/main/resources/mapper/NetmemberMapper.xml index 2b8e75f..f034200 100644 --- a/src/main/resources/mapper/NetmemberMapper.xml +++ b/src/main/resources/mapper/NetmemberMapper.xml @@ -134,7 +134,7 @@ - SELECT m.* ,c.CMNCODNAM usercolor