Merge remote-tracking branch 'origin/master'

rain

2026-01-29 faf55275dcb8d413f18642b3410c8e7df9f6cd9c

 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml

@@ -39,8 +39,12 @@
    </resultMap>

    <select id="selectGdFlyerPage" resultMap="gdFlyerVOResultMap">
        select * from ja_gd_flyer
        select
            *
        from
            ja_gd_flyer
        <where>
                is_deleted = 0
            <if test="param2.flyerName != null and param2.flyerName != ''">
                and flyer_name like concat('%',#{param2.flyerName},'%')
            </if>
@@ -56,6 +60,12 @@
            <if test="param2.skilledTaskType != null and param2.skilledTaskType != ''">
                and skilled_task_type = #{param2.skilledTaskType}
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                AND create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>
    </select>