From b1ec36b9f51c02a152945f9ae59b775dc6fb83da Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Fri, 19 Jul 2024 13:17:34 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=20=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20=EC=A0=91=EC=86=8D?=
 =?UTF-8?q?=EA=B5=AC=EB=B6=84(=ED=96=89=EC=A0=95=EB=A7=9D,=EC=9D=B8?=
 =?UTF-8?q?=ED=84=B0=EB=84=B7=EB=A7=9D)=20=EA=B2=80=EC=83=89=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/base/web/UserController.java     |  2 +
 .../resources/sql/mapper/base/user-mapper.xml | 11 ++-
 .../jsp/base/authority/authority-main.jsp     |  4 +-
 .../WEB-INF/jsp/base/authority/user-list.jsp  | 93 ++++++++++---------
 .../WEB-INF/jsp/base/user/user-main.jsp       | 16 +++-
 5 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/base/web/UserController.java b/src/main/java/cokr/xit/fims/base/web/UserController.java
index 2adfdfd2..637d924d 100644
--- a/src/main/java/cokr/xit/fims/base/web/UserController.java
+++ b/src/main/java/cokr/xit/fims/base/web/UserController.java
@@ -47,6 +47,8 @@ public class UserController extends cokr.xit.base.user.web.UserController<FimsUs
 	@Override
 	public ModelAndView main() {
 		ModelAndView mav = super.main();
+		Map<String, List<CommonCode>> commonCodes = codeService.getCodesOf("CMN009");
+		mav.addObject("CMN009List", commonCodes.get("CMN009"));
 		return mav;
 	}
 
diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml
index ce1ad4ee..e86c7cba 100644
--- a/src/main/resources/sql/mapper/base/user-mapper.xml
+++ b/src/main/resources/sql/mapper/base/user-mapper.xml
@@ -90,8 +90,15 @@ SELECT A.USER_ID
 			</otherwise>
 		</choose>
 	</if>
-	<if test="userIDs != null">USER_ID IN (<foreach collection="userIDs" item="userID" separator=",">#{userID}</foreach>)</if>
-	<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@null2void(status) != ''">AND STTS = #{status}</if>
+	<if test="userIDs != null">
+	USER_ID IN (<foreach collection="userIDs" item="userID" separator=",">#{userID}</foreach>)
+	</if>
+	<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@null2void(status) != ''">
+	AND STTS = #{status}
+	</if>
+	<if test="@org.egovframe.rte.fdl.string.EgovStringUtil@null2void(type) != ''">
+	AND CNTN_SE_CD = #{type}
+	</if>
 </where>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix" />
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 69473c99..1175b6f3 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
@@ -73,7 +73,9 @@
   </ul>
   <div class="tab-content" style="padding:.6em 0;" id="${infoPrefix}RightInclude">
     <div class="tab-pane fade show active" id="navs-top-users" role="tabpanel">
-		<jsp:include page="user-list.jsp" />
+    	<div class="ox-scroll">
+    		<jsp:include page="user-list.jsp" />
+    	</div>
     </div>
     <div class="tab-pane fade" id="navs-top-actions" role="tabpanel">
 		<jsp:include page="actionGroup-list.jsp" />
diff --git a/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp b/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp
index 5d1a3957..8fcb38f1 100644
--- a/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp
@@ -1,51 +1,52 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
-				<div class="d-flex flex-row justify-content-end p-3">
-					<div>
-						<button id="btnAddAuthUsers" onclick="${infoPrefix}Control.addUsers();" class="btn btn-primary">+ 추가</button>
-						<button id="btnRemoveAuthUsers" onclick="removeAuthUsers();" class="btn btn-primary">- 제거</button>
-					</div>
-				</div>
-				<table class="datatables-ajax table table-bordered dataTable no-footer" id="DataTables_Table_0" aria-describedby="DataTables_Table_0_info">
-					<thead>
-						<tr><th tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" style="text-align:center;"><input id="authUserToggler" onchange="${infoPrefix}Control.users.select(this.checked);" type="checkbox" class="form-check-input"></th>
-							<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending">시군구명</th>
-                            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending" >기관명</th>
-                            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending" >부서명</th>
-                            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending" >사용자 계정</th>
-                            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending" >사용자 이름</th>
-                            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Start date: activate to sort column ascending" >등록일자</th>
-						</tr>
-                    </thead>
-                    <tbody id="authUserList">
-					</tbody>
-                   	<template id="authUserRow">
-                   	<tr data-key="{AUTH_ID}-{USER_ID}">
-                       <td style="text-align:center;"><input value="{AUTH_ID}-{USER_ID}" onchange="${infoPrefix}Control.users.select('{AUTH_ID}-{USER_ID}', this.checked);" type="checkbox" class="form-check-input"></td>
-                       <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{SGG_NM}</td>
-                       <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{INST_NM}</td>
-                       <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{DEPT_NM}</td>
-                       <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{USER_ACNT}</td>
-                       <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{USER_NM}</td>
-                       <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}">{REG_DT}</td>
-                    </tr>
-                    </template>
-                   	<template id="authUserNotFound">
-					<tr class="odd">
-						<td valign="top" colspan="7" class="dataTables_empty text-center">사용자 정보를 찾지 못했습니다.</td>
-					</tr>
-                    </template>
-                   	<template id="implicitActions">
-					<tr class="odd">
-						<td valign="top" colspan="7" class="dataTables_empty text-center">{authority}는 사용자를 지정하지 않습니다.</td>
-					</tr>
-                    </template>
-				</table>
-				<div class="d-flex flex-row p-3 justify-content-between">
-					<label id="authUserPagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
-	                 <ul id="authUserPaging" class="pagination pagination-primary">
-	                 </ul>
-				</div>
+<div class="d-flex flex-row justify-content-end p-3">
+	<div>
+		<button id="btnAddAuthUsers" onclick="${infoPrefix}Control.addUsers();" class="btn btn-primary">+ 추가</button>
+		<button id="btnRemoveAuthUsers" onclick="removeAuthUsers();" class="btn btn-primary">- 제거</button>
+	</div>
+</div>
+<table class="datatables-ajax table table-bordered dataTable no-footer" id="DataTables_Table_0" aria-describedby="DataTables_Table_0_info">
+	<thead>
+		<tr>
+			<th tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" style="text-align:center;"><input id="authUserToggler" onchange="${infoPrefix}Control.users.select(this.checked);" type="checkbox" class="form-check-input"></th>
+			<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending">시군구명</th>
+            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending" >기관명</th>
+            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending" >부서명</th>
+            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending" >사용자 계정</th>
+            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending" >사용자 이름</th>
+            <th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Start date: activate to sort column ascending" >등록일자</th>
+		</tr>
+	</thead>
+    <tbody id="authUserList">
+	</tbody>
+    <template id="authUserRow">
+       	<tr data-key="{AUTH_ID}-{USER_ID}">
+            <td style="text-align:center;"><input value="{AUTH_ID}-{USER_ID}" onchange="${infoPrefix}Control.users.select('{AUTH_ID}-{USER_ID}', this.checked);" type="checkbox" class="form-check-input"></td>
+            <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{SGG_NM}</td>
+            <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{INST_NM}</td>
+            <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{DEPT_NM}</td>
+            <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{USER_ACNT}</td>
+            <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{USER_NM}</td>
+            <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}">{REG_DT}</td>
+        </tr>
+	</template>
+	<template id="authUserNotFound">
+		<tr class="odd">
+			<td valign="top" colspan="7" class="dataTables_empty text-center">사용자 정보를 찾지 못했습니다.</td>
+		</tr>
+	</template>
+	<template id="implicitActions">
+		<tr class="odd">
+			<td valign="top" colspan="7" class="dataTables_empty text-center">{authority}는 사용자를 지정하지 않습니다.</td>
+		</tr>
+	</template>
+</table>
+<div class="d-flex flex-row p-3 justify-content-between">
+	<label id="authUserPagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
+              <ul id="authUserPaging" class="pagination pagination-primary">
+              </ul>
+</div>
 <c:set var="userFunc" scope="request">
 function removeAuthUsers() {
 	dialog.alert({
diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp
index a458b961..aa52ca55 100644
--- a/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp
@@ -6,8 +6,8 @@
         <div id="DataTables_Table_0_wrapper" class="dataTables_wrapper dt-bootstrap5 no-footer">
         
 			<div class="d-flex flex-row justify-content-between p-3">
-				<div class="d-flex" id="${infoPrefix}-query">
-					<div class="input-group me-3">
+				<div class="d-flex flex-grow-1 me-5" id="${infoPrefix}-query">
+					<div class="input-group me-3 w-px-400">
 						<select id="${infoPrefix}by" name="by" onchange="document.getElementById('${infoPrefix}term').focus();" aria-controls="DataTables_Table_0" class="form-select">
 							<option value="${infoPrefix}Name">이름</option>
 							<option value="${infoPrefix}Account">계정</option>
@@ -15,13 +15,20 @@
 						<input id="${infoPrefix}term" name="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
 						
 					</div>
-					<label for="${infoPrefix}status" class="form-label fw-bold w-px-120 d-flex flex-wrap align-content-center justify-content-center">상태</label>
+					<label for="${infoPrefix}status" class="form-label fw-bold px-3 d-flex flex-wrap align-content-center justify-content-center">상태</label>
 					<select id="${infoPrefix}status" name="status" class="form-select">
 						<option value="">전체</option>
 						<option value="A">신청</option>
 						<option value="P">승인</option>
 						<option value="D">삭제</option>
 					</select>
+					<label for="${infoPrefix}type" class="form-label fw-bold px-3 d-flex flex-wrap align-content-center justify-content-center">접속구분</label>
+					<select id="${infoPrefix}type" name="type" class="form-select">
+						<option value="">전체</option>
+						<c:forEach items="${CMN009List}" var="item">
+							<option value="${item.code}">${item.value}</option>
+						</c:forEach>
+					</select>
 				</div>
 				<div>
 					<button onclick="search${infoPrefix}s();" class="btn btn-primary">찾기</button>
@@ -83,7 +90,8 @@ function search${infoPrefix}s() {
 	${infoPrefix}Control.query = {
 		by: $("#${infoPrefix}-query [name='by']").val(),
 		term: $("#${infoPrefix}-query [name='term']").val(),
-		status: $("#${infoPrefix}-query [name='status']").val()
+		status: $("#${infoPrefix}-query [name='status']").val(),
+		type: $("#${infoPrefix}-query [name='type']").val(),
 	};
 	
 	if(${infoPrefix}Control.query.by == "userAccount"){