Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-28 b0da63410a7aaf64b11183c95b3da38013a6457b

 ard-route/src/main/resources/mapper/ArdRouteFileMapper.xml

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.route.mapper.ArdRouteFileMapper">
    

    <resultMap type="ArdRouteFile" id="ArdRouteFileResult">
        <result property="id"    column="id"    />
        <result property="name"    column="name"    />
@@ -33,15 +33,19 @@

    <select id="selectArdRouteFileList" parameterType="ArdRouteFile" resultMap="ArdRouteFileResult">
        <include refid="selectArdRouteFileVo"/>
        <where>  
        <where>
            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
            <if test="folderId != null  and folderId != ''"> and folder_id = #{folderId}</if>
            <if test="fileType != null  and fileType != ''"> and file_type = #{fileType}</if>
            <if test="fileSize != null "> and file_size = #{fileSize}</if>
            <if test="filePath != null  and filePath != ''"> and file_path = #{filePath}</if>
            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
            <if test="createTime != null "> and create_time = #{createTime}</if>
            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
            <if test="updateTime != null "> and update_time = #{updateTime}</if>
        </where>
    </select>
    

    <select id="selectArdRouteFileById" parameterType="String" resultMap="ArdRouteFileResult">
        <include refid="selectArdRouteFileVo"/>
        where id = #{id}
@@ -60,7 +64,7 @@
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
         </trim>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="name != null">#{name},</if>
@@ -72,7 +76,7 @@
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
         </trim>
        </trim>
    </insert>

    <update id="updateArdRouteFile" parameterType="ArdRouteFile">
@@ -95,14 +99,18 @@
        delete from ard_route_file where id = #{id}
    </delete>

    <delete id="deleteArdRouteFileByFolderId" parameterType="String">
        delete from ard_route_file where folder_id = #{folderId}
    </delete>

    <delete id="deleteArdRouteFileByIds" parameterType="String">
        delete from ard_route_file where id in 
        delete from ard_route_file where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>

    <delete id="deleteRouteFileByFolderIds" parameterType="String">
        delete from ard_route_file where folder_id in
        <foreach item="folderId" collection="array" open="(" separator="," close=")">
            #{folderId}
        </foreach>
    </delete>

</mapper>