Merge remote-tracking branch 'origin/master'

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}),
+                UPDATE fence SET finds_fence_id = #{params.findsId}
-                    finds_fence_code = COALESCE(finds_fence_code, #{params.findsCode}) WHERE id = #{params.id}
+                <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>