From 6132e3f5328c065cb24e7f21b8a302c7797e9c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Fri, 20 Jan 2023 11:28:55 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dbnt/faisp/main/authMgt/AuthMgtController.java     | 7 ++++++-
 .../resources/templates/adminPage/authMgt/authMgt.html     | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/authMgt/AuthMgtController.java b/src/main/java/com/dbnt/faisp/main/authMgt/AuthMgtController.java
index f0d23e4c..0b8a9be7 100644
--- a/src/main/java/com/dbnt/faisp/main/authMgt/AuthMgtController.java
+++ b/src/main/java/com/dbnt/faisp/main/authMgt/AuthMgtController.java
@@ -5,6 +5,7 @@ import com.dbnt.faisp.main.authMgt.model.AuthMgt;
 import com.dbnt.faisp.main.userInfo.service.UserInfoService;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -18,12 +19,16 @@ public class AuthMgtController {
   private final AuthMgtService authMgtService;
 
   @GetMapping("/authMgtPage")
-  public ModelAndView authMgtPage(UserInfo userInfo) {
+  public ModelAndView authMgtPage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo) {
     ModelAndView mav = new ModelAndView("adminPage/authMgt/authMgt");
     userInfo.setQueryInfo();
+    userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
+
     mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo));
     userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo));
     userInfo.setPaginationInfo();
+
+    mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
     mav.addObject("searchParams", userInfo);
     return mav;
   }
diff --git a/src/main/resources/templates/adminPage/authMgt/authMgt.html b/src/main/resources/templates/adminPage/authMgt/authMgt.html
index 3edc2463..7d2928b7 100644
--- a/src/main/resources/templates/adminPage/authMgt/authMgt.html
+++ b/src/main/resources/templates/adminPage/authMgt/authMgt.html
@@ -28,8 +28,10 @@
                   <div class="col-auto">
                     <select class="form-select form-select-sm" name="ogCd">
                       <option value="">관서 선택</option>
-                      <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                        <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ogCd==commonCode.itemCd}"></option>
+                      <th:block th:each="code:${session.commonCode.get('OG')}">
+                        <th:block th:if="${code.useChk eq 'T' and #lists.contains(mgtOrganList, code.itemCd)}">
+                          <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ogCd eq code.itemCd}"></option>
+                        </th:block>
                       </th:block>
                     </select>
                   </div>