Merge remote-tracking branch 'origin/main'

guoshilong

2023-09-26 3ba2ea4de914835bc316826f2c7f93a648760e9c

 src/main/java/com/dji/sample/media/dao/IFileMapper.xml

@@ -19,7 +19,7 @@
            AND file_name LIKE CONCAT('%',#{query.name},'%')
        </if>

        <if test="query.fileSubType != null and query.fileSubType !='' ">
        <if test="query.subFileType != null and query.subFileType !='' ">
            AND sub_file_type in
            <foreach collection="query.fileSubType.split(',')" item="item" open="(" separator="," close=")">
                #{item}
@@ -27,10 +27,7 @@
        </if>

        <if test="query.payload != null and query.payload !='' ">
            AND sub_file_type in
            <foreach collection="query.payload.split(',')" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
            AND payload LIKE CONCAT('%',#{query.payload},'%')
        </if>

    </select>