opt: sql改造其他模块改造10

linwei

2026-04-02 83382b860d137529f69a97888c2efa13f9ea2227

opt: sql改造其他模块改造10

 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml

@@ -24,29 +24,31 @@

    <select id="selectFwDroneFlightRecordPage" resultMap="fwDroneFlightRecordResultMap">
        select
            dfr.*
        dfr.*
        from
            ja_fw_drone_flight_record dfr
        ja_fw_drone_flight_record dfr
        left join
            ja_fw_device d on dfr.device_id = d.id::VARCHAR
        /* 修改点1：双向转型对齐 */
        ja_fw_device d on dfr.device_id::text = d.id::text
        <where>
                dfr.is_deleted = 0
                and d.track_status = 1
                and d.is_enabled = 1
            dfr.is_deleted = 0
            and d.track_status = 1
            and d.is_enabled = 1
            <if test="param2.regionCode != null and param2.regionCode != ''">
                and (d.final_outbound_area_code like CONCAT(#{param2.regionCode}, '%')
                <!-- 或者设备是共享给当前部门的 -->
                <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
                    or dfr.device_id in (
                    SELECT device_id FROM ja_fw_device_per_share
                    WHERE loan_to_dept_id = #{param2.currentDeptId}
                    /* 修改点2：dfr.device_id 转 text 以匹配子查询，参数加 ::bigint */
                    or dfr.device_id::text in (
                    SELECT device_id::text FROM ja_fw_device_per_share
                    WHERE loan_to_dept_id = #{param2.currentDeptId}::bigint
                    AND is_deleted = 0
                    )
                </if>
                )
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and dfr.device_id = #{param2.deviceId}
                /* 修改点3：过滤条件参数对齐 */
                and dfr.device_id::text = #{param2.deviceId}::text
            </if>
            <if test="param2.droneName != null and param2.droneName != ''">
                and dfr.drone_name like CONCAT('%', #{param2.droneName}, '%')