From dcf88de35f8c84fbfa5ee2d69f96854a4455c571 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 5 Jan 2024 10:13:44 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=84=A4=EC=A0=95,=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EB=B6=84=EB=A5=98=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/mapper/base/authority-mapper.xml | 15 ++++++++++++--- .../resources/sql/mapper/base/user-mapper.xml | 1 + .../jsp/base/actionGroup/actionGroup-main.jsp | 8 ++++---- .../jsp/base/actionGroup/select-actionGroup.jsp | 8 ++++---- .../jsp/base/authority/actionGroup-list.jsp | 8 +++++--- .../jsp/base/authority/authority-main.jsp | 14 +++++++------- .../WEB-INF/jsp/base/authority/user-list.jsp | 16 ++++++++++++---- .../webapp/WEB-INF/jsp/base/user/select-user.jsp | 8 +++++++- src/main/webapp/resources/js/base/user.js | 2 +- 9 files changed, 53 insertions(+), 27 deletions(-) diff --git a/src/main/resources/sql/mapper/base/authority-mapper.xml b/src/main/resources/sql/mapper/base/authority-mapper.xml index 0ff4d748..94f295c1 100644 --- a/src/main/resources/sql/mapper/base/authority-mapper.xml +++ b/src/main/resources/sql/mapper/base/authority-mapper.xml @@ -64,8 +64,9 @@ DELETE FROM TB_AUTHORITY @@ -104,7 +105,15 @@ SELECT A.AUTH_ID -SELECT A.*, USER_ACNT +SELECT A.* + , B.USER_ACNT + , B.USER_NM + , B.ORG_ID + , (SELECT SGG_NM FROM TB_SGG WHERE SGG_CD = B.ORG_ID) AS SGG_NM + , B.NSTT_CD + , (SELECT INST_NM FROM TB_SGG WHERE SGG_CD = B.ORG_ID) AS NSTT_NM + , B.DEPT_CD + , (SELECT DEPT_NM FROM TB_DEPT WHERE DEPT_CD = B.DEPT_CD) AS DEPT_NM FROM TB_AUTH_USER A , TB_USER B diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml index ce888949..46f077f7 100644 --- a/src/main/resources/sql/mapper/base/user-mapper.xml +++ b/src/main/resources/sql/mapper/base/user-mapper.xml @@ -60,6 +60,7 @@ SELECT USER_ID , POS_NM , GRP_ID , ORG_ID + , (SELECT SGG_NM FROM TB_SGG WHERE SGG_CD = A.ORG_ID) AS SGG_NM , DEPT_CD , (CASE WHEN A.DEPT_CD = 'default' 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 ebcb60d9..f9fdbb46 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 @@ -19,8 +19,8 @@
@@ -34,8 +34,8 @@ - - + + diff --git a/src/main/webapp/WEB-INF/jsp/base/actionGroup/select-actionGroup.jsp b/src/main/webapp/WEB-INF/jsp/base/actionGroup/select-actionGroup.jsp index bcbd16e3..410f3726 100644 --- a/src/main/webapp/WEB-INF/jsp/base/actionGroup/select-actionGroup.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/actionGroup/select-actionGroup.jsp @@ -9,8 +9,8 @@
@@ -22,8 +22,8 @@
- - + + diff --git a/src/main/webapp/WEB-INF/jsp/base/authority/actionGroup-list.jsp b/src/main/webapp/WEB-INF/jsp/base/authority/actionGroup-list.jsp index 6c0fc541..c79548a7 100644 --- a/src/main/webapp/WEB-INF/jsp/base/authority/actionGroup-list.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/authority/actionGroup-list.jsp @@ -9,7 +9,8 @@ - + + @@ -19,17 +20,18 @@ + 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 c9f87458..f4fb4ba6 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 @@ -14,14 +14,14 @@