From b5bddfcaf171e65d7212cf8aa0d25597137c37d4 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 29 Jul 2020 17:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/entity/UserCustomerEntity.java | 10 ++++++++--
 .../epmet/service/impl/UserResiInfoServiceImpl.java    |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java
index 0b92baede7..d7d5312df9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java
@@ -20,12 +20,18 @@ public class UserCustomerEntity extends BaseEpmetEntity {
 
     /**
      * 客户Id
-     * */
+     */
     private String customerId;
 
     /**
      * 用户Id
-     * */
+     */
     private String userId;
 
+    /**
+     * 是否注册 1已注册 0未注册
+     */
+    private String isRegister;
+
+
 }
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 c2e90bfcf4..37c52c4583 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
@@ -211,7 +211,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		//2:判断手机号是否可用
 		//2020-07-29 根据要注册的网格获取客户Id
 		UserResiRegisterVisitDTO registerVisitDTO = userResiRegisterVisitService.get(verificationCodeFormDTO.getResiVisitId());
-		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile(), registerVisitDTO.getUserId())) {
+		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile(), registerVisitDTO.getCustomerId())) {
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
 		}
 		//3:调用短信服务 生成验证码发送短信