From de9010d67652f313156f35f8447a9cd7bbd81449 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 7 Jun 2022 15:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=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 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 eeb6ccc7a6..32c4aa9095 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
@@ -441,11 +441,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 //2021.11.25 新增需求 客户下身份证号唯一  start
                 if (map.containsKey("ID_CARD")) {
-                    IcResiUserDTO dto = new IcResiUserDTO();
-                    dto.setCustomerId(tokenDto.getCustomerId());
-                    dto.setIdCard(map.get("ID_CARD"));
-                    IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(map.get("ID_CARD"), dto.getCustomerId());
-                    if (null != userDTO && null != userDTO.getIdCard()) {
+                    LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(IcResiUserEntity::getCustomerId, tokenDto.getCustomerId());
+                    wrapper.eq(IcResiUserEntity::getIdCard, map.get("ID_CARD"));
+                    wrapper.ne(IcResiUserEntity::getId, map.get("ID"));
+                    List<IcResiUserEntity> entityList = baseDao.selectList(wrapper);
+                    if (CollectionUtils.isNotEmpty(entityList)) {
                         String errorMsg = "修改居民信息失败，身份证号已存在!";
                         throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                     }