From c38f0a5a345ace8fc01966c2a4b1003a3b14203d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 24 Oct 2022 09:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E6=A0=B8?=
 =?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B=E6=94=B9ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/NatUserInfoResultDTO.java   |  5 +++++
 .../src/main/resources/mapper/IcNatDao.xml           | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
index 278f3ca537..dc696ff8dc 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
@@ -32,4 +32,9 @@ public class NatUserInfoResultDTO implements Serializable {
      * 18大类 中 某一类的 是否值，用于比较 同步数据结果确定是否要插入到表中
      */
     private String categoryColumn;
+
+    /**
+     * ic_nat表ID
+     */
+    private String id;
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
index ea4f9a8bc6..df1cda47a4 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
@@ -158,6 +158,7 @@
     <select id="getExistNatInfo" resultType="com.epmet.dto.result.NatUserInfoResultDTO">
         <foreach collection="list" item="l" separator="UNION ALL">
             SELECT
+                ID,
             USER_ID,
             ID_CARD
             FROM ic_nat
@@ -194,30 +195,29 @@
         <trim prefix="set" suffixOverrides=",">
             <trim prefix="NAT_TIME =(case" suffix="end),">
                 <foreach collection="list" item="l">
-                    when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natTime}
+                    when ID = #{l.id} then #{l.natTime}
                 </foreach>
             </trim>
             <trim prefix="NAT_ADDRESS =(case" suffix="end),">
                 <foreach collection="list" item="l">
-                    when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natAddress}
+                    when ID = #{l.id} then #{l.natAddress}
                 </foreach>
             </trim>
             <trim prefix="NAT_RESULT =(case" suffix="end),">
                 <foreach collection="list" item="l">
-                    when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.natResult}
+                    when ID = #{l.id} then #{l.natResult}
                 </foreach>
             </trim>
             <trim prefix="MOBILE =(case" suffix="end),">
                 <foreach collection="list" item="l">
-                    when USER_ID = #{l.userId} AND ID_CARD = #{l.idCard} then #{l.mobile}
+                    when ID = #{l.id} then #{l.mobile}
                 </foreach>
             </trim>
             UPDATED_TIME = NOW()
         </trim>
         WHERE DEL_FLAG = '0'
         <foreach collection="list" item="l" separator=",">
-            AND USER_ID = #{l.userId}
-            AND ID_CARD = #{l.idCard}
+            AND ID = #{l.id}
         </foreach>
 
     </update>