From d3a948d58a08fdad04376b41ce9ebf387df5bd94 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 15 Nov 2022 13:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=AF=94=E5=AF=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=94=B9=E4=B8=BA=20agency=5Fid+com?=
 =?UTF-8?q?pare=5Frec=5Fid=E5=94=AF=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcNatCompareRecordServiceImpl.java | 4 +++-
 .../src/main/resources/mapper/IcNatCompareRecRelationDao.xml  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
index 38bde062d2..47efdc1980 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatCompareRecordServiceImpl.java
@@ -285,7 +285,8 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
                     .set(IcNatCompareRecordEntity::getLatestImportTime, origin.getLatestImportTime())
                     .set(IcNatCompareRecordEntity::getInternalRemark, origin.getInternalRemark());
             baseDao.update(null,updateWrapper);
-            IcNatCompareRecRelationEntity existRelationEntity=icNatCompareRecRelationDao.selectExist(data.getCustomerId(),origin.getId(),staffInfo.getAgencyId(),importDate);
+            // 关系表 agency_id+compare_rec_id唯一
+            IcNatCompareRecRelationEntity existRelationEntity = icNatCompareRecRelationDao.selectExist(data.getCustomerId(), origin.getId(), staffInfo.getAgencyId(), null);
             if(null!=existRelationEntity){
                 // 是否本社区（agency_id）下居民(0:否  1:是)
                 if (null != icResiUserDTO && icResiUserDTO.getAgencyId().equals(staffInfo.getAgencyId())) {
@@ -295,6 +296,7 @@ public class IcNatCompareRecordServiceImpl extends BaseServiceImpl<IcNatCompareR
                 }
                 //记录最后一次导入时间、最近一次操作人id,最近一次操作人姓名
                 existRelationEntity.setImportTime(importTime);
+                existRelationEntity.setImportDate(importDate);
                 existRelationEntity.setStaffId(staffInfo.getStaffId());
                 existRelationEntity.setStaffName(staffInfo.getRealName());
                 existRelationEntity.setAgencyName(staffInfo.getAgencyName());
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecRelationDao.xml
index e3f58f05b1..95ebe37015 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecRelationDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecRelationDao.xml
@@ -33,6 +33,8 @@
           AND r.CUSTOMER_ID = #{customerId}
           AND r.COMPARE_REC_ID = #{compareRecId}
           AND r.AGENCY_ID = #{agencyId}
+        <if test='null != importDate and "" != importDate'>
           AND r.IMPORT_DATE = #{importDate}
+        </if>
     </select>
 </mapper>
\ No newline at end of file