From d0a54fb341fdbe77737fd89610b7797da943223a Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Fri, 6 Dec 2019 13:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/EpdcAppUserRegisterFormDTO.java  |  1 +
 .../epdc/service/impl/AppUserServiceImpl.java | 30 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java
index 6f16750a3..937dcd476 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java
@@ -26,6 +26,7 @@ public class EpdcAppUserRegisterFormDTO implements Serializable {
     /**
      * 网格ID
      */
+    @NotNull(message = "网格ID不能为空")
     private Long gridId;
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 91a9930e8..ee67aff1f 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -644,21 +644,21 @@ public class AppUserServiceImpl implements AppUserService {
         WxMaJscode2SessionResult wxMaResult = this.getWxMaUser(formDto.getWxCode());
         String openId = wxMaResult.getOpenid();
         String unionId = wxMaResult.getUnionid();
-        if (null == formDto.getGridId()) {
-            // 获取用户绑定网格信息
-            Result<EpdcUserRegisterInfoResultDTO> dtoResult = userFeignClient.getUserLastSwitchGrid(openId);
-            if (!dtoResult.success()) {
-                return new Result<EpdcAppAuthorizationDTO>().error(dtoResult.getMsg());
-            }
-            EpdcUserRegisterInfoResultDTO userDto = dtoResult.getData();
-            if (userDto.getRegisterState() != NumConstant.TWO) {
-                EpdcAppAuthorizationDTO resultDto = new EpdcAppAuthorizationDTO();
-                resultDto.setUserState(NumConstant.FIVE_STR);
-                return new Result<EpdcAppAuthorizationDTO>().ok(resultDto);
-            } else {
-                formDto.setGridId(userDto.getGridId());
-            }
-        }
+//        if (null == formDto.getGridId()) {
+//            // 获取用户绑定网格信息
+//            Result<EpdcUserRegisterInfoResultDTO> dtoResult = userFeignClient.getUserLastSwitchGrid(openId);
+//            if (!dtoResult.success()) {
+//                return new Result<EpdcAppAuthorizationDTO>().error(dtoResult.getMsg());
+//            }
+//            EpdcUserRegisterInfoResultDTO userDto = dtoResult.getData();
+//            if (userDto.getRegisterState() != NumConstant.TWO) {
+//                EpdcAppAuthorizationDTO resultDto = new EpdcAppAuthorizationDTO();
+//                resultDto.setUserState(NumConstant.FIVE_STR);
+//                return new Result<EpdcAppAuthorizationDTO>().ok(resultDto);
+//            } else {
+//                formDto.setGridId(userDto.getGridId());
+//            }
+//        }
         // 查询当前微信注册状态
         EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO();
         checkFromDto.setOpenId(openId);