Merge remote-tracking branch 'origin/master'

rain

2026-01-28 54898304203f3ea0c132899dca4341dc182d13de

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml

@@ -31,7 +31,10 @@


    <select id="selectFwEffectEvalPage" resultMap="fwEffectEvalResultMap">
        select * from ja_fw_effect_eval
        select
            *
        from
            ja_fw_effect_eval
        <where>
            is_deleted = 0
            <if test="param2.deviceName != null and param2.deviceName != ''">
@@ -43,6 +46,12 @@
            <if test="param2.counterEffect != null and param2.counterEffect != ''">
                and counter_effect = #{param2.counterEffect}
            </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>