From 17ad411b387ff1266df9cfe6424656713129c04c 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: Wed, 5 Apr 2023 13:50:00 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94?=
 =?UTF-8?q?=EB=89=B4=EC=97=90=EC=84=9C=20=EB=B9=84=EC=99=B8=EC=82=AC?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=ED=91=9C=ED=98=84=20=EC=98=A4?=
 =?UTF-8?q?=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

---
 src/main/java/com/dbnt/faisp/config/BaseController.java   | 2 +-
 .../com/dbnt/faisp/main/userInfo/UserMgtController.java   | 8 ++++----
 src/main/resources/mybatisMapper/UserInfoMapper.xml       | 2 +-
 .../templates/adminPage/userMgt/accessChange.html         | 6 ++++--
 .../resources/templates/adminPage/userMgt/userMgt.html    | 4 +++-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java
index 6760fee2..dc01ad34 100644
--- a/src/main/java/com/dbnt/faisp/config/BaseController.java
+++ b/src/main/java/com/dbnt/faisp/config/BaseController.java
@@ -46,7 +46,7 @@ public class BaseController {
   public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) {
     ModelAndView mav = null;
     if(loginUser == null){
-      mav = new ModelAndView("redirect:/login2");
+      mav = new ModelAndView("redirect:/login");
     }else{
       mav = new ModelAndView("redirect:/dashboard");
     }
diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
index 86637ec2..b78c6c5a 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
@@ -37,13 +37,13 @@ public class UserMgtController {
   public ModelAndView userMgtPage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo) {
     ModelAndView mav = new ModelAndView("adminPage/userMgt/userMgt");
     userInfo.setQueryInfo();
-    if(userInfo.getUserStatus() == null || userInfo.getUserStatus().equals("")) {
-    	userInfo.setUserStatus("USC003");
-    }
     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;
   }
@@ -124,12 +124,12 @@ public class UserMgtController {
   public ModelAndView accessChangePage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo){
     ModelAndView mav = new ModelAndView("adminPage/userMgt/accessChange");
     userInfo.setQueryInfo();
-    userInfo.setUserStatus("USC003");
     userInfo.setUserRole(loginUser.getUserRole());
     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/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index 7a699686..86a8d89d 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -11,7 +11,7 @@
           user_status = #{userStatus}
         </when>
         <otherwise>
-          user_status = 'USC003'
+          user_status in ('USC003', 'USC007')
         </otherwise>
       </choose>
       <if test='userId != null and userId != ""'>
diff --git a/src/main/resources/templates/adminPage/userMgt/accessChange.html b/src/main/resources/templates/adminPage/userMgt/accessChange.html
index 166a5596..ba117005 100644
--- a/src/main/resources/templates/adminPage/userMgt/accessChange.html
+++ b/src/main/resources/templates/adminPage/userMgt/accessChange.html
@@ -31,8 +31,10 @@
                 <div class="col-auto">
                   <select class="form-select form-select-sm" name="ogCd" id="ogCdSearch">
                     <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>
diff --git a/src/main/resources/templates/adminPage/userMgt/userMgt.html b/src/main/resources/templates/adminPage/userMgt/userMgt.html
index 81def043..0626633f 100644
--- a/src/main/resources/templates/adminPage/userMgt/userMgt.html
+++ b/src/main/resources/templates/adminPage/userMgt/userMgt.html
@@ -42,7 +42,9 @@
                       <select class="form-select form-select-sm" name="ogCd" id="ogCdSearch">
                         <option value="">관서 선택</option>
                         <th:block th:each="code:${session.commonCode.get('OG')}">
-                          <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ogCd eq code.itemCd}"></option>
+                          <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>