외사경찰관리 승인목록 양식 수정.

src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java

@@ -36,6 +36,9 @@ public class UserMgtController {
   @GetMapping("/userMgtPage")
   public ModelAndView userMgtPage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo) {
     ModelAndView mav = new ModelAndView("adminPage/userMgt/userMgt");
+    if(userInfo.getUserStatus() == null){
+      userInfo.setUserStatus("USC003");
+    }
     userInfo.setQueryInfo();
     userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
 

src/main/resources/mybatisMapper/UserInfoMapper.xml

@@ -7,6 +7,9 @@
   <sql id="selectUserInfoWhere">
     <where>
       <choose>
+        <when test='userStatus == "USC003"'>
+          user_status in ('USC003', 'USC007')
+        </when>
         <when test='userStatus != null and userStatus != ""'>
           user_status = #{userStatus}
         </when>
@@ -45,6 +48,7 @@
   </sql>
   <select id="selectUserInfoList" resultType="UserInfo" parameterType="UserInfo">
     select user_seq,
+           user_status,
            dic_code,
            user_id,
            user_nm,

src/main/resources/templates/adminPage/userMgt/userMgt.html

@@ -20,7 +20,7 @@
             <button class="nav-link" th:classappend="${searchParams.userStatus eq 'USC003'?'active':''}" id="apprvTab" data-bs-toggle="tab" type="button" role="tab">승인목록</button>
           </li>
           <li class="nav-item" role="presentation">
-            <button class="nav-link" th:classappend="${searchParams.userStatus ne 'USC003'?'active':''}" id="stayTab" data-bs-toggle="tab" type="button" role="tab">승인대기</button>
+            <button class="nav-link" th:classappend="${searchParams.userStatus eq 'USC002'?'active':''}" id="stayTab" data-bs-toggle="tab" type="button" role="tab">승인대기</button>
           </li>
         </ul>
         <div class="row mx-0">
@@ -86,6 +86,7 @@
                   <thead>
                   <tr class="table-secondary">
                     <th> <input type="checkbox" class="allChk"></th>
+                    <th th:if="${searchParams.userStatus ne 'USC002'}">구분</th>
                     <th>소속</th>
                     <th>부서</th>
                     <th>계급</th>
@@ -103,6 +104,11 @@
                     <td class="checkBoxTd">
                       <input type="checkbox" id="userChk" name="userChk" class="userInfoCheckBox" th:value="${userInfo.userSeq}">
                     </td>
+                    <td th:if="${searchParams.userStatus ne 'USC002'}">
+                      <th:block th:each="code:${session.commonCode.get('USC')}">
+                        <th:block th:if="${code.itemCd eq userInfo.userStatus}" th:text="${code.itemValue}"></th:block>
+                      </th:block>
+                    </td>
                     <td>
                       <th:block th:each="code:${session.commonCode.get('OG')}">
                         <th:block th:if="${code.itemCd eq userInfo.ogCd}" th:text="${code.itemValue}"></th:block>

src/main/resources/templates/fragments/header.html

@@ -25,7 +25,7 @@
               <li><hr class="dropdown-divider"></li>
             </th:block>
             <th:block sec:authorize="hasRole('ROLE_SUB_ADMIN')">
-              <li><a href="/userMgt/userMgtPage?userStatus=USC003" class="dropdown-item">외사경찰관리</a></li>
+              <li><a href="/userMgt/userMgtPage" class="dropdown-item">외사경찰관리</a></li>
               <li><a href="/authMgt/authMgtPage" class="dropdown-item">권한설정</a></li>
               <li><a href="/userMgt/userLog/requestLog" class="dropdown-item">사용자로그</a></li>
               <li><a href="/userMgt/accessChangePage" class="dropdown-item">접속설정</a></li>