From 45ef35eb0f71218ca6f2a00e20a59b81fbe1f57f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 7 Dec 2021 14:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=9C=AC=E4=BA=BA=E5=A4=96=EF=BC=8C=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=B7=B2=E8=A2=AB=E4=BD=BF=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mine/service/impl/PersonalCenterServiceImpl.java | 1 + .../main/java/com/epmet/dto/form/EditInfoFormDTO.java | 6 ++++++ .../src/main/java/com/epmet/dao/UserResiInfoDao.java | 4 +++- .../epmet/service/impl/UserResiInfoServiceImpl.java | 10 ++++++++-- .../src/main/resources/mapper/UserResiInfoDao.xml | 3 +++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java index d3cf8a2a64..d60b177815 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java @@ -46,6 +46,7 @@ public class PersonalCenterServiceImpl implements PersonalCenterService { @Override public void editInfo(TokenDto tokenDto, EditInfoFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); Result result = epmetUserOpenFeignClient.editUserInfo(formDTO); if (!result.success()) { throw new RenException(result.getCode(), result.getMsg()); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java index a4565ffc6d..d3a29103dc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java @@ -60,4 +60,10 @@ public class EditInfoFormDTO implements Serializable { */ @NotBlank(message = "昵称不能为空") private String nickname; + + /** + * 当前客户id + */ + @NotBlank(message = "customerId不能为空") + private String customerId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index 31f4625abf..048b6d114b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -102,7 +102,9 @@ public interface UserResiInfoDao extends BaseDao { * @param idNum * @return */ - Integer selectCountByIdNum(@Param("idNum") String idNum,@Param("customerId") String customerId); + Integer selectCountByIdNum(@Param("idNum") String idNum, + @Param("customerId") String customerId, + @Param("excludeUserId")String excludeUserId); UserResiInfoDTO selectByIdNum(@Param("customerId") String customerId, @Param("idNum")String idNum, diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index cede578427..96ce44f847 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -220,7 +220,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl NumConstant.ZERO) { + if (baseDao.selectCountByIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(),null) > NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用"); } } @@ -307,7 +307,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl 0) { + if (baseDao.selectCountByIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(),userResiInfoDTO.getUserId()) > 0) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用"); } //居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一 @@ -384,6 +384,12 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl0){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用"); + } + } //更新居民注册信息表 baseDao.updateByUserId(ConvertUtils.sourceToTarget(formDTO, UserResiInfoEntity.class)); //更新baseInfo diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index c0bc153d95..968abeff28 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -185,6 +185,9 @@ uri.DEL_FLAG = '0' AND uri.id_num = #{idNum} and uri.customer_id=#{customerId} + + AND uri.user_id != #{excludeUserId} +