From eeb3b5c9c794a35d7b7f3c8e56f9eef8eb8d3451 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 01 Apr 2026 17:20:19 +0800
Subject: [PATCH] opt:兼容人大金仓
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
index d5be047..93dc678 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
@@ -41,7 +41,7 @@
<include refid="deviceFields"/>,a.*
from
ja_fw_device_scrap a
- left join ja_fw_device b on (a.device_id = b.id)
+ left join ja_fw_device b on (a.device_id = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="id != null and id != ''">
@@ -56,7 +56,7 @@
<include refid="deviceFields"/>,a.*
from
ja_fw_device_scrap a
- left join ja_fw_device b on (a.device_id = b.id)
+ left join ja_fw_device b on (a.device_id = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="param2.deviceId != null and param2.deviceId != ''">
--
Gitblit v1.9.3