Merge remote-tracking branch 'origin/main'

src/main/resources/sql/mapper/base/file-mapper.xml

@@ -20,21 +20,24 @@
 </resultMap>
 
 <sql id="fileDirs">SELECT INF_TYPE
-     , CONCAT('C://workspace/xit/base/files/', DIR, DATE_FORMAT(CURRENT_DATE, '%Y/%m/%d/')) DIR
+     , CONCAT('files/', DIR, DATE_FORMAT(CURRENT_DATE, '/%Y/%m/%d/')) DIR
   FROM (
 	   SELECT '00' INF_TYPE, 'attachment/' DIR FROM DUAL UNION
 	   SELECT '01' INF_TYPE, 'document/' DIR FROM DUAL UNION
-	   SELECT '02' INF_TYPE, 'article/' DIR FROM DUAL
+	   SELECT '02' INF_TYPE, 'article/' DIR FROM DUAL UNION
-       ) FILE_DIRS</sql>
+	   
+	   SELECT '100' INF_TYPE, 'attachment/dsuse' DIR FROM DUAL
+	   SELECT '110' INF_TYPE, 'document/dsuse' DIR FROM DUAL
+	   ) FILE_DIRS</sql>
 
 <sql id="selectFiles">
 <if test="fileIDs != null">
-SELECT A.*, REPLACE(FILE_PATH, 'C://workspace/xit/base', '') URL
+SELECT A.*, FILE_PATH URL
   FROM TB_FILE A
  WHERE FILE_ID IN (<foreach collection="fileIDs" item="fileID" separator=",">#{fileID}</foreach>)
  ORDER BY FILE_ID</if>
 <if test="fileIDs == null"><include refid="utility.paging-prefix" />
-SELECT A.*, REPLACE(FILE_PATH, 'C://workspace/xit/base', '') URL
+SELECT A.*, FILE_PATH URL
   FROM TB_FILE A
 <where>
 <if test="infoType != null">  AND A.INF_TYPE = #{infoType}</if>