From 41e39107b463854c6de0520e86d0b521c65b6b52 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Mon, 8 Jul 2024 16:48:52 +0900
Subject: [PATCH] =?UTF-8?q?fileDir,=20fileUrl=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/mapper/base/department-mapper.xml     |  3 +--
 .../resources/sql/mapper/base/file-mapper.xml | 21 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/sql/mapper/base/department-mapper.xml b/src/main/resources/sql/mapper/base/department-mapper.xml
index 799fab6..ab7a1c0 100644
--- a/src/main/resources/sql/mapper/base/department-mapper.xml
+++ b/src/main/resources/sql/mapper/base/department-mapper.xml
@@ -41,8 +41,7 @@
   <if test="sggID != null"> AND SGG_CD = #{sggID}</if>
   <if test="instCode != null"> AND INST_CD = #{instCode}</if>
   <if test="deptIDs != null"> AND DEPT_CD IN (<foreach collection="deptIDs" item="deptID" separator=",">#{deptID}</foreach>)</if>
-  <if test="!includeAll"> AND USE_YN = 'Y'</if>
-  </where>
+  <if test="!includeAll"> AND USE_YN = 'Y'</if></where>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix" /></select>
 
diff --git a/src/main/resources/sql/mapper/base/file-mapper.xml b/src/main/resources/sql/mapper/base/file-mapper.xml
index 357b61d..caff7b8 100644
--- a/src/main/resources/sql/mapper/base/file-mapper.xml
+++ b/src/main/resources/sql/mapper/base/file-mapper.xml
@@ -19,9 +19,16 @@
 	<result property="useYN" column="USE_YN"/>
 </resultMap>
 
+<sql id="fileDir">CONCAT(#{addsFileRootPath}, DIR, DATE_FORMAT(CURRENT_DATE, '%Y/%m/%d/'))</sql>
+<sql id="fileUrl">(CASE 
+        WHEN REPLACE(FILE_PATH,#{type},'/files/') LIKE '_:%'
+        THEN SUBSTR(REPLACE(FILE_PATH,#{type},'/files/'),3)
+        ELSE REPLACE(FILE_PATH,#{type},'/files/')
+        END)</sql>
+
 <sql id="fileDirs">
 SELECT INF_TYPE
-     , CONCAT(#{addsFileRootPath}, DIR, DATE_FORMAT(CURRENT_DATE, '/%Y/%m/%d/')) DIR
+     ,<include refid="cokr.xit.base.file.dao.FileMapper.fileDir" /> DIR
   FROM (
 	   SELECT '00' INF_TYPE, 'attachment' DIR FROM DUAL UNION
 	   SELECT '01' INF_TYPE, 'document' DIR FROM DUAL UNION
@@ -47,11 +54,7 @@ SELECT A.FILE_ID
      , A.USE_YN
      , A.REG_DT
      , A.RGTR
-     , (CASE 
-        WHEN REPLACE(FILE_PATH,#{type},'/files/') LIKE '_:%'
-        THEN SUBSTR(REPLACE(FILE_PATH,#{type},'/files/'),3)
-        ELSE REPLACE(FILE_PATH,#{type},'/files/')
-        END) AS URL
+     ,<include refid="cokr.xit.base.file.dao.FileMapper.fileUrl" /> AS URL
   FROM TB_FILE A
  WHERE FILE_ID IN (<foreach collection="fileIDs" item="fileID" separator=",">#{fileID}</foreach>)
  ORDER BY FILE_ID
@@ -71,11 +74,7 @@ SELECT A.FILE_ID
      , A.USE_YN
      , A.REG_DT
      , A.RGTR
-     , (CASE 
-        WHEN REPLACE(FILE_PATH,#{type},'/files/') LIKE '_:%'
-        THEN SUBSTR(REPLACE(FILE_PATH,#{type},'/files/'),3)
-        ELSE REPLACE(FILE_PATH,#{type},'/files/')
-        END) AS URL
+     ,<include refid="cokr.xit.base.file.dao.FileMapper.fileUrl" /> AS URL
   FROM TB_FILE A
 <where>
 <if test="infoType != null">  AND A.INF_TYPE = #{infoType}</if>