From 4ee0c9859d134f5e186cd3c542584a644de948b5 Mon Sep 17 00:00:00 2001 From: leebj Date: Tue, 25 Jun 2024 16:17:13 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B6=8C=ED=95=9C=EA=B4=80=EB=A6=AC,=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EB=B6=84=EB=A5=98=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=95=20=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/base/ActionGroupController.java | 14 +++++++++++++- .../cokr/xit/fims/base/AuthorityController.java | 14 +++++++++++++- .../jsp/base/actionGroup/actionGroup-main.jsp | 1 + .../WEB-INF/jsp/base/authority/authority-main.jsp | 1 + 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/main/java/cokr/xit/fims/base/ActionGroupController.java b/src/main/java/cokr/xit/fims/base/ActionGroupController.java index b369fde3..db5fe1f1 100644 --- a/src/main/java/cokr/xit/fims/base/ActionGroupController.java +++ b/src/main/java/cokr/xit/fims/base/ActionGroupController.java @@ -1,6 +1,18 @@ package cokr.xit.fims.base; import org.springframework.stereotype.Controller; +import org.springframework.web.servlet.ModelAndView; + +import cokr.xit.base.security.access.service.ActionQuery; @Controller -public class ActionGroupController extends cokr.xit.base.security.access.web.ActionGroupController {} \ No newline at end of file +public class ActionGroupController extends cokr.xit.base.security.access.web.ActionGroupController { + + @Override + public ModelAndView main() { + ModelAndView mav = getActionGroupList(new ActionQuery().setFetchAll(true)); + mav.setViewName("base/actionGroup/actionGroup-main"); + return mav.addObject("groupList", toJson(mav.getModel().get("groupList"))); + } + +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/base/AuthorityController.java b/src/main/java/cokr/xit/fims/base/AuthorityController.java index 93f1b5ff..8cb4169c 100644 --- a/src/main/java/cokr/xit/fims/base/AuthorityController.java +++ b/src/main/java/cokr/xit/fims/base/AuthorityController.java @@ -1,6 +1,18 @@ package cokr.xit.fims.base; import org.springframework.stereotype.Controller; +import org.springframework.web.servlet.ModelAndView; + +import cokr.xit.base.security.access.service.AuthorityQuery; @Controller -public class AuthorityController extends cokr.xit.base.security.access.web.AuthorityController {} \ No newline at end of file +public class AuthorityController extends cokr.xit.base.security.access.web.AuthorityController { + + @Override + public ModelAndView main() { + ModelAndView mav = getAuthorityList(new AuthorityQuery().setFetchAll(true)); + mav.setViewName("base/authority/authority-main"); + return mav.addObject("authorityList", toJson(mav.getModel().remove("authorityList"))); + } + +} \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp b/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp index 539a88f4..4da949c2 100644 --- a/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp @@ -108,6 +108,7 @@ function searchaction${infoPrefix}s() { by:$("#by").val(), term:$("#term").val() }; + action${infoPrefix}Control.groups.query.fetchAll = true; action${infoPrefix}Control.groups.load(1); } 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 218c8f3f..c04e3c8a 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 @@ -93,6 +93,7 @@ function search${infoPrefix}s() { by:$("#by").val(), term:$("#term").val() }; + ${infoPrefix}Control.authorities.query.fetchAll = true; ${infoPrefix}Control.authorities.load(1); }