From 3913773d3731d3574ac1a55b40d7677bbf3d9c1d Mon Sep 17 00:00:00 2001
From: shenzhidan <hezhiqiang@zcloudchina.com>
Date: Fri, 14 Aug 2026 09:32:23 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/FindsSyncStateMapper.xml    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/web-infrastructure/src/main/resources/mapper/FindsSyncStateMapper.xml b/web-infrastructure/src/main/resources/mapper/FindsSyncStateMapper.xml
index 5a34a89..14a8da9 100644
--- a/web-infrastructure/src/main/resources/mapper/FindsSyncStateMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/FindsSyncStateMapper.xml
@@ -50,14 +50,17 @@
     <update id="recordMapping">
         <choose>
             <when test="entityType == 'FENCE'">
-                UPDATE fence SET finds_fence_id = COALESCE(finds_fence_id, #{params.findsId}),
-                    finds_fence_code = COALESCE(finds_fence_code, #{params.findsCode}) WHERE id = #{params.id}
+                UPDATE fence SET finds_fence_id = #{params.findsId}
+                <if test="params.findsCode != null">, finds_fence_code = #{params.findsCode}</if>
+                WHERE id = #{params.id} AND finds_fence_id IS NULL
             </when>
             <when test="entityType == 'ALARM_RULE'">
-                UPDATE alarm_rule SET finds_rule_id = COALESCE(finds_rule_id, #{params.findsId}) WHERE id = #{params.id}
+                UPDATE alarm_rule SET finds_rule_id = #{params.findsId}
+                WHERE id = #{params.id} AND finds_rule_id IS NULL
             </when>
             <otherwise>
-                UPDATE terminal SET finds_terminal_id = COALESCE(finds_terminal_id, #{params.findsId}) WHERE id = #{params.id}
+                UPDATE terminal SET finds_terminal_id = #{params.findsId}
+                WHERE id = #{params.id} AND finds_terminal_id IS NULL
             </otherwise>
         </choose>
     </update>