From ed52bb40108154a664812db3c1e16c279c910640 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 13 Jul 2022 11:05:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/BindHomeFormDTO.java    | 2 ++
 .../main/java/com/epmet/controller/IcResiUserController.java | 2 +-
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java   | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java
index 7256b32f3f..04aafe1f0c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java
@@ -25,7 +25,9 @@ public class BindHomeFormDTO implements Serializable {
     /**
      * 用户id
      */
+    @NotBlank(message = "客户id不能为空")
     private String customerId;
 
+    @NotBlank(message = "人id不能为空")
     private String userId;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index c9c3747c01..161be43e92 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -1181,9 +1181,9 @@ public class IcResiUserController implements ResultDataResolver {
      */
     @PostMapping("/bindHome")
     public Result bindHome(@RequestBody BindHomeFormDTO form, @LoginUser TokenDto tokenDto) {
-        ValidatorUtils.validateEntity(form);
         form.setCustomerId(tokenDto.getCustomerId());
         form.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(form);
         icResiUserService.bindHome(form);
         return new Result();
     }
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 7dbb773630..af4166ab2c 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
@@ -2832,6 +2832,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         // 将人的信息放入ic_resi_user对象中
         IcResiUserEntity entity = new IcResiUserEntity();
         entity.setCustomerId(form.getCustomerId());
+        formDTO.setCustomerId(form.getCustomerId());
+        formDTO.setStaffId(form.getUserId());
         // 进行日期转换
         if(residentDetailByIdCard.getBirthday() == null){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取出生日期失败", "获取出生日期失败");
@@ -2882,8 +2884,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         formDTO.setNewBuildingUnitId(houseInfo.getBuildingUnitId());
         formDTO.setNewHouseId(houseInfo.getHomeId());
         formDTO.setTransferTime(new java.util.Date());
-        formDTO.setCustomerId(form.getCustomerId());
-        formDTO.setStaffId(form.getUserId());
+
 
         if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) {
            String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());