From 13d701f391126b31d15d746e5f7184cdf41be867 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 26 Jun 2024 10:16:53 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EC=84=9C=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/mapper/user-mapper.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/sql/mapper/user-mapper.xml b/src/main/resources/sql/mapper/user-mapper.xml
index a94c2f1..fb66328 100644
--- a/src/main/resources/sql/mapper/user-mapper.xml
+++ b/src/main/resources/sql/mapper/user-mapper.xml
@@ -25,8 +25,8 @@
 	<result property="positionName"       column="POS_NM"/>
 	<result property="groupID"            column="GRP_ID"/>
 	<result property="orgID"              column="ORG_ID"/>
-	<result property="deptCode"           column="DEPT_CD"/>
 	<result property="institute"          column="NSTT_CD"/>
+	<result property="deptCode"           column="DEPT_CD"/>
 	<result property="certificateDn"      column="CRTFC_DN"/>
 	<result property="locked"             column="LOCK_YN"/>
 	<result property="lockCount"          column="LOCK_CNT"/>
@@ -60,7 +60,7 @@ SELECT USER_ID
      , POS_NM
      , GRP_ID
      , ORG_ID
-     , DEPT_CD
+     , A.DEPT_CD
      , NSTT_CD
      , CRTFC_DN
      , LOCK_YN
@@ -68,7 +68,16 @@ SELECT USER_ID
      , LOCK_DT
      , REG_DT
      , STTS
-  FROM TB_USER
+     , INST_NM
+     , DEPT_NM
+  FROM TB_USER A
+  LEFT OUTER JOIN (
+       SELECT A.SGG_CD, SGG_NM, A.INST_CD, INST_NM, DEPT_CD, DEPT_NM
+         FROM TB_SGG A LEFT OUTER JOIN TB_DEPT B
+           ON A.SGG_CD = B.SGG_CD
+          AND A.INST_CD = B.INST_CD
+          AND A.USE_YN = 'Y' AND B.USE_YN = 'Y'
+      ) B ON A.NSTT_CD = B.INST_CD AND A.DEPT_CD = B.DEPT_CD 
 <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>
@@ -114,6 +123,7 @@ INSERT INTO TB_USER (
      , GRP_ID
      , ORG_ID
      , NSTT_CD
+     , DEPT_CD
      , CRTFC_DN
      , LOCK_YN
      , LOCK_CNT
@@ -147,6 +157,7 @@ INSERT INTO TB_USER (
      , #{groupID}
      , #{orgID}
      , #{institute}
+     , #{deptCode}
      , #{certificateDn}
      , 'N'
      , 0
@@ -180,6 +191,7 @@ UPDATE TB_USER SET
      , GRP_ID = #{groupID}
      , ORG_ID = #{orgID}
      , NSTT_CD = #{institute}
+     , DEPT_CD = #{deptCode}
      , CRTFC_DN = #{certificateDn}
      , STTS = #{status}
      , MDFCN_DT =<include refid="utility.now" />