Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

 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,21 @@
            <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 test="param2.currentDeptId != null and param2.currentDeptId != '' ">
                    or device_id in (
                    SELECT device_id FROM ja_fw_device_per_share
                    WHERE loan_to_dept_id = #{param2.currentDeptId}
                    AND is_deleted = 0
                    )
                </if>
                )
            </if>
        </where>
    </select>