设备列表查询新增多个区域信息

rain

2026-02-03 74b5d54c1cf5dc585a2fe135f4ce4dd2b374b4dd

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml

@@ -106,11 +106,37 @@
            is_deleted = 0
            <if test="isAreaSelect != null and isAreaSelect == 1">
                and (
                    <choose>
                        <when test="areaId != null">
                            exists (
                                select 1
                                from ja_fw_area_divide ad
                <choose>
                    <when test="areaIds != null and areaIds.size > 0">
                        exists (
                        select 1
                        from ja_fw_area_divide ad
                        where ad.is_deleted = 0
                        and ad.id in
                        <foreach collection="areaIds" item="areaIdItem" separator="," open="(" close=")">
                            #{areaIdItem}
                        </foreach>
                        and ad.device_ids is not null
                        and ad.device_ids != ''
                        and find_in_set(ja_fw_device.id, ad.device_ids)
                        )
                        or not exists (
                        select 1
                        from ja_fw_area_divide ad
                        where ad.is_deleted = 0
                        and ad.device_ids is not null
                        and ad.device_ids != ''
                        and find_in_set(ja_fw_device.id, ad.device_ids)
                        and ad.id not in
                        <foreach collection="areaIds" item="areaIdItem" separator="," open="(" close=")">
                            #{areaIdItem}
                        </foreach>
                        )
                    </when>
                    <when test="areaId != null">
                        exists (
                        select 1
                        from ja_fw_area_divide ad
                                where ad.is_deleted = 0
                                and ad.id = #{areaId}
                                and ad.device_ids is not null