【注册绑定网格】

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -734,7 +734,7 @@ public class AppUserServiceImpl implements AppUserService {
         // IP地址
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
 
-        return this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId());
+        return this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId(),formDto.getGridId());
     }
 
     @Override
@@ -770,7 +770,7 @@ public class AppUserServiceImpl implements AppUserService {
      * @author liuchuang
      * @since 2019/10/25 12:49
      */
-    private Result<EpdcAppAuthorizationDTO> dealWithUserRegisterState(EpdcUserRegisterInfoResultDTO userResult, String openId, String unionId, String ipAddress, String inviteUserId) {
+    private Result<EpdcAppAuthorizationDTO> dealWithUserRegisterState(EpdcUserRegisterInfoResultDTO userResult, String openId, String unionId, String ipAddress, String inviteUserId,Long currentGridId) {
         EpdcUserRegisterBindGridFormDTO registerBindGridFormDto = new EpdcUserRegisterBindGridFormDTO();
         // 用户注册状态 0-未注册未绑定网格，1-已注册未绑定当前网格，2-已注册已绑定当前网格
         Integer registerState = userResult.getRegisterState();
@@ -781,6 +781,8 @@ public class AppUserServiceImpl implements AppUserService {
             // 组装用户注册信息
             registerBindGridFormDto.setRegisterState(NumConstant.ZERO);
             registeredUser = this.packageUserInfo(openId, unionId, ipAddress);
+            gridId = currentGridId;
+            registeredUser.setDeptId(currentGridId);
             registerBindGridFormDto.setUserDTO(registeredUser);
         }
         // 已注册未绑定当前网格