编辑家庭成员优化

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);
         }