From b4186e591be6b75a53748f929e3e7ede0b024f30 Mon Sep 17 00:00:00 2001 From: yujintao Date: Mon, 2 Mar 2020 17:37:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=97=B6=E5=B1=85=E4=BD=8F=E7=BD=91=E6=A0=BCid?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=E4=B8=8D=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/AppUserServiceImpl.java | 6 ++++-- .../src/main/resources/i18n/messages.properties | 2 +- 2 files changed, 5 insertions(+), 3 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 c1b39f271..266e7562e 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 @@ -771,7 +771,9 @@ public class AppUserServiceImpl implements AppUserService { UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class); userDto.setRealName(ModuleUtils.replaceIllegalCharacter(infoDto.getRealName())); - userDto.setDeptId(infoDto.getGridId()); + Long gridId = infoDto.getGridId(); + gridId = (null == gridId || NumConstant.ZERO_L == gridId) ? tokenDto.getGridId() : gridId; + userDto.setDeptId(gridId); userDto.setId(tokenDto.getUserId()); // 党员提交，验证身份证号 @@ -795,7 +797,7 @@ public class AppUserServiceImpl implements AppUserService { String userState = verifyResult.getData(); userDto.setWxUnionId(getWxUnionId(infoDto.getWxCode(), infoDto.getIv(), infoDto.getEncryptedData())); - UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(infoDto.getGridId()); + UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(gridId); EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class); completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto, userState); // 组装对象，准备保存用户信息 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties index 01a538f52..f64345dc2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties @@ -1,3 +1,3 @@ #Default #100006001=\u5728\u515A\u5458\u5E93\u4E2D\u6CA1\u6709\u627E\u5230\u60A8\u7684\u4FE1\u606F\uFF0C\u6211\u4EEC\u5148\u5C06\u60A8\u8BA4\u8BC1\u4E3A\u5C45\u6C11\uFF0C\u8BF7\u8054\u7CFB\u5F53\u5730\u7BA1\u7406\u4EBA\u5458\u5B8C\u5584\u515A\u5458\u5E93\u540E\u7EE7\u7EED\u8BA4\u8BC1 -100006001=\u8BA4\u8BC1\u4FE1\u606F\u63D0\u4EA4\u6210\u529F\uFF0C\u6211\u4EEC\u6536\u5230\u60A8\u7684\u8BA4\u8BC1\u4FE1\u606F\uFF0C\u4F1A\u5C3D\u5FEB\u5BA1\u6838\uFF0C\u60A8\u53EF\u4EE5\u4EAB\u53D7\u5E73\u53F0\u7684\u670D\u52A1\u4E86 \ No newline at end of file +100006001=\u6211\u4EEC\u6536\u5230\u60A8\u7684\u8BA4\u8BC1\u4FE1\u606F\uFF0C\u4F1A\u5C3D\u5FEB\u5BA1\u6838\uFF0C\u60A8\u53EF\u4EE5\u4EAB\u53D7\u5E73\u53F0\u7684\u670D\u52A1\u4E86 \ No newline at end of file