From 1ab1d8a0184963e4db956664f0ed2f004a52f324 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 7 Jun 2022 15:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AE=B6=E5=BA=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserServiceImpl.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 1fc7662a7f..5319171d16 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -2303,8 +2303,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     public Result editMember(IcResiUserConfirmSubmitDTO dto) {
         IcResiUserEntity user = icResiUserDao.selectById(dto.getIcResiUserId());
 
-        IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), user.getCustomerId());
-        if (null != userDTO && null != userDTO.getIdCard()) {
+        LambdaQueryWrapper<IcResiUserEntity> userWrapper = new LambdaQueryWrapper<>();
+        userWrapper.ne(IcResiUserEntity::getId, dto.getIcResiUserId());
+        userWrapper.eq(IcResiUserEntity::getIdCard, dto.getIdCard());
+        userWrapper.eq(IcResiUserEntity::getCustomerId, user.getCustomerId());
+        List<IcResiUserEntity> userList = baseDao.selectList(userWrapper);
+        if (CollectionUtils.isNotEmpty(userList)) {
             String errorMsg = "修改居民信息失败，身份证号已存在!";
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
         }