代码调整

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

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:调用短信服务 生成验证码发送短信