opt:兼容人大金仓

xiebin

2026-04-01 eeb3b5c9c794a35d7b7f3c8e56f9eef8eb8d3451

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

@@ -46,14 +46,14 @@
                FROM
                    ja_fw_alarm_favorite f
                WHERE
                    f.alarm_record_id = dar.id
                    f.alarm_record_id = dar.id::VARCHAR
                AND  f.user_id = #{param2.currentUserId}   -- MyBatis 参数
                AND  f.is_deleted = 0
                ) AS favorited
        from
            ja_fw_drone_alarm_record dar
        left join
            ja_fw_device d on dar.device_id = d.id
            ja_fw_device d on dar.device_id = d.id::VARCHAR
        <where>
                dar.is_deleted = 0
                and d.is_enabled = 1
@@ -143,7 +143,7 @@
        d.status deviceStatus
        from
        ja_fw_drone_alarm_record dar
        left join ja_fw_device d on dar.device_id = d.id
        left join ja_fw_device d on dar.device_id = d.id::VARCHAR
        <where>
            dar.is_deleted = 0
            <if test="ids != null and ids.size() > 0">
@@ -174,7 +174,7 @@
        FROM
            ja_fw_drone_alarm_record  dar
        left join
            ja_fw_device d on dar.device_id = d.id
            ja_fw_device d on dar.device_id = d.id::VARCHAR
        WHERE dar.is_deleted = 0
            AND d.is_deleted = 0
            and d.is_enabled = 1