Merge remote-tracking branch 'origin/master'

zhongrj

2026-02-04 67397f33249a996c124e2e561e53c1f19974e1cb

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

@@ -92,10 +92,19 @@
                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and create_dept in
                and ( create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
                <!-- 或者设备是共享给当前部门的 -->
                <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
                    or 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>
@@ -104,68 +113,60 @@
        select * from ja_fw_device
        <where>
            is_deleted = 0
            <if test="isAreaSelect != null and isAreaSelect == 1">
                and (
                <choose>
                    <when test="areaIds != null and areaIds.size > 0">
            <choose>
                <when test="areaIds != null and areaIds.size > 0">
                    and (
                        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)
                    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
                                and ad.device_ids != ''
                                and find_in_set(ja_fw_device.id, ad.device_ids)
                    )
                </when>
                <when test="isAreaSelect != null and isAreaSelect == 1">
                    and (
                    <choose>
                        <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
                            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 != #{areaId}
                            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 != #{areaId}
                            )
                        </when>
                        <otherwise>
                            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)
                            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)
                            )
                        </otherwise>
                    </choose>
                )
            </if>
                    )
                </when>
            </choose>
            <if test="status != null">
                and status = #{status}
            </if>