调整合并文件接口(新增文件分类)

src/main/resources/mapper/upload/SysFileDao.xml

@@ -3,14 +3,16 @@
 <mapper namespace="com.backendsys.modules.upload.dao.SysFileDao">
 
     <sql id="includeFileSimple">
-        id,
-        upload_id,
-        name,
-        object_key,
-        md5,
-        upload_time,
-        create_time,
-        update_time
+        f.id,
+        COALESCE(f.category_id, '') category_id,
+        COALESCE(fc.category_name, '') category_name,
+        f.upload_id,
+        f.name,
+        f.object_key,
+        f.md5,
+        f.upload_time,
+        f.create_time,
+        f.update_time
     </sql>
     <sql id="includeFile">
         f.id,
@@ -37,6 +39,8 @@
 
     <resultMap id="resultMapFileSimple" type="java.util.LinkedHashMap">
         <id property="id" column="id" jdbcType="BIGINT" />
+        <result property="category_id" column="category_id" javaType="java.lang.Long" />
+        <result property="category_name" column="category_name" />
         <result property="upload_id" column="upload_id" />
         <result property="name" column="name" />
         <result property="object_key" column="object_key" />
@@ -70,22 +74,23 @@
 
     <select id="selectUploadFileSimple" resultMap="resultMapFileSimple">
         SELECT <include refid="includeFileSimple" />
-        FROM sys_file
+        FROM sys_file f
+        LEFT JOIN sys_file_category fc ON f.category_id = fc.id
         <where>
             <if test="user_id != null and user_id != ''">
-                AND user_id = #{user_id}
+                AND f.user_id = #{user_id}
             </if>
             <if test="upload_id != ''">
-                AND upload_id = #{upload_id}
+                AND f.upload_id = #{upload_id}
             </if>
             <if test="object_key != null and object_key != ''">
-                AND object_key = #{object_key}
+                AND f.object_key = #{object_key}
             </if>
             <if test="md5 != null and md5 != ''">
-                AND md5 = #{md5}
+                AND f.md5 = #{md5}
             </if>
         </where>
-        ORDER BY upload_time DESC
+        ORDER BY f.upload_time DESC
     </select>
 
     <select id="selectUploadFileList" resultMap="resultMapFileList">