diff --git a/src/main/java/cokr/xit/fims/base/web/UserController.java b/src/main/java/cokr/xit/fims/base/web/UserController.java index 2adfdfd2..637d924d 100644 --- a/src/main/java/cokr/xit/fims/base/web/UserController.java +++ b/src/main/java/cokr/xit/fims/base/web/UserController.java @@ -47,6 +47,8 @@ public class UserController extends cokr.xit.base.user.web.UserController> commonCodes = codeService.getCodesOf("CMN009"); + mav.addObject("CMN009List", commonCodes.get("CMN009")); return mav; } diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml index ce1ad4ee..e86c7cba 100644 --- a/src/main/resources/sql/mapper/base/user-mapper.xml +++ b/src/main/resources/sql/mapper/base/user-mapper.xml @@ -90,8 +90,15 @@ SELECT A.USER_ID - USER_ID IN (#{userID}) - AND STTS = #{status} + + USER_ID IN (#{userID}) + + + AND STTS = #{status} + + + AND CNTN_SE_CD = #{type} + diff --git a/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp b/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp index 69473c99..1175b6f3 100644 --- a/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp @@ -73,7 +73,9 @@