From eb9af98eef77c82235cde1f53e87a4993cd0f74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Tue, 25 Aug 2020 13:38:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B3=A8=E5=86=8C=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/AppUserServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 fcd95f955..bfd6b5cf8 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 @@ -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 dealWithUserRegisterState(EpdcUserRegisterInfoResultDTO userResult, String openId, String unionId, String ipAddress, String inviteUserId) { + private Result 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); } // 已注册未绑定当前网格