diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index 7a187535..8781305a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -87,6 +87,10 @@ public class UserUpdateExe { } } + if(!Objects.equals(userE.getUserIdCard(), userDO.getUserIdCard())){ + //判断 + userRepository.checkUserIdCard(userUpdateCmd.getId(),userUpdateCmd.getUserIdCard()); + } CorpInfoDO corpInfoDO = corpInfoRepository.getById(userDO.getCorpinfoId()); if(corpInfoDO != null){ diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java index b6b10161..4f199986 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java @@ -81,7 +81,7 @@ public interface UserRepository extends BaseRepository { UserDO getByPhoneAndIdCard(String phone, String idCardNumber); - void checkUserIdCard(@NotNull(message = "手机号不能为空") String phone, String userIdCard); + void checkUserIdCard( Long id, String userIdCard); List getListByPhone(String phone,List employmentFlagList); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index ae9b5133..d44d2d0b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -535,10 +535,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i } @Override - public void checkUserIdCard(String phone, String userIdCard) { + public void checkUserIdCard(Long id, String userIdCard) { Map verifyParam = new HashMap<>(); verifyParam.put("userIdCard", userIdCard); - verifyParam.put("phone", phone); + verifyParam.put("id", id); Integer count = userMapper.countUser(verifyParam); if (count > 0) { throw new BizException("身份证号已经存在,请联系管理员");