Merge remote-tracking branch 'origin/master'

linwei

2026-01-30 4db2325a48fa099337835cec2ebb49e817275a7d

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml

@@ -54,11 +54,22 @@
        <where>
            ds.is_deleted = 0
            <if test="unbound != null and unbound == 1">
                and not exists (
                    select 1
                    from ja_fw_defense_scene_manage dsm
                    where dsm.is_deleted = 0
                      and dsm.defense_scene_id = ds.id
                and (
                    not exists (
                        select 1
                        from ja_fw_defense_scene_manage dsm
                        where dsm.is_deleted = 0
                          and dsm.defense_scene_id = ds.id
                    )
                    <if test="sceneManageId != null">
                        or exists (
                            select 1
                            from ja_fw_defense_scene_manage dsm
                            where dsm.is_deleted = 0
                              and dsm.id = #{sceneManageId}
                              and dsm.defense_scene_id = ds.id
                        )
                    </if>
                )
            </if>
            <if test="filterSelected != null and filterSelected == 1">