From 543032a7612fb9d135f7b2d485191bd7daabdff1 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 18 Sep 2023 09:11:19 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=A9=94?=
 =?UTF-8?q?=EC=9D=B8=ED=99=94=EB=A9=B4=20=EA=B8=B0=EA=B4=80,=EB=B6=80?=
 =?UTF-8?q?=EC=84=9C=20=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/mapper/base/user-mapper.xml | 14 +++++++++++++-
 .../webapp/WEB-INF/jsp/base/user/user-main.jsp     | 10 +++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml
index c2b818d4..5827767c 100644
--- a/src/main/resources/sql/mapper/base/user-mapper.xml
+++ b/src/main/resources/sql/mapper/base/user-mapper.xml
@@ -61,14 +61,26 @@ SELECT USER_ID
      , GRP_ID
      , ORG_ID
      , DEPT_CD
+     , (CASE 
+        WHEN A.DEPT_CD = 'default'
+        THEN '기본 부서'
+        ELSE (SELECT DEPT_NM FROM TB_DEPT_INFO WHERE DEPT_CD = A.DEPT_CD)
+        END
+       ) AS DEPT_NM
      , NSTT_CD
+     , (CASE
+        WHEN A.NSTT_CD = 'default'
+        THEN '기본 기관'
+        ELSE (SELECT INST_NM FROM TB_SGG_INFO WHERE INST_CD = A.NSTT_CD) 
+        END
+       ) AS NSTT_NM
      , CRTFC_DN
      , LOCK_YN
      , LOCK_CNT
      , LOCK_DT
      , REG_DT
      , STTS
-  FROM TB_USER
+  FROM TB_USER A
 <where><if test="by != null and term != null">AND ${by} LIKE CONCAT('%', #{term}, '%')</if>
 	<if test="userIDs != null">USER_ID IN (<foreach collection="userIDs" item="userID" separator=",">#{userID}</foreach>)</if>
     <if test="status == null and userIDs == null">AND STTS != 'D'</if>
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 0d7d3654..3d1d0cf8 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
@@ -37,8 +37,10 @@
 										<input onchange="${infoPrefix}Control.select(this.checked);" type="checkbox" class="form-check-input"></th>
 									<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">계정</th>
 									<th class="sorting" style="width: 146.156px;">이름</th>
+									<th class="sorting" style="width: 146.156px;">기관</th>
+									<th class="sorting" style="width: 146.156px;">부서</th>
+									<th class="sorting" style="width: 160.141px;">전화번호(유선)</th>
 									<th class="sorting" style="width: 195.688px;">이메일</th>
-									<th class="sorting" style="width: 160.141px;">전화번호(무선)</th>
 									<th class="sorting" style="width: 230.469px;">등록일자</th>
 								</tr>
 		                    </thead>
@@ -49,14 +51,16 @@
 		                       <td style="text-align:center;"><input value="{USER_ID}" onchange="${infoPrefix}Control.select('{USER_ID}', this.checked);" type="checkbox" class="form-check-input"></td>
 		                       <td {onclick} {ondblclick}>{USER_ACNT}</td>
 		                       <td {onclick} {ondblclick}>{USER_NM}</td>
+		                       <td {onclick} {ondblclick}>{NSTT_NM}</td>
+		                       <td {onclick} {ondblclick}>{DEPT_NM}</td>
+		                       <td {onclick} {ondblclick}>{TELNO}</td>
 		                       <td {onclick} {ondblclick}>{EML_ADRS}</td>
-		                       <td {onclick} {ondblclick}>{MBL_TELNO}</td>
 		                       <td {onclick} {ondblclick}>{REG_DT}</td>
 		                    </tr>
 		                    </template>
 		                   	<template id="${infoPrefix}NotFound">
 							<tr class="odd">
-								<td valign="top" colspan="6" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
+								<td valign="top" colspan="8" class="dataTables_empty text-center">${prefixName} 정보를 찾지 못했습니다.</td>
 							</tr>
 		                    </template>
 						</table>