From d9f5c93dd01b88de3a2d4b1890648934ca7ec7ed Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Mon, 9 Dec 2019 14:54:21 +0800 Subject: [PATCH] =?UTF-8?q?prepareCompleteUserInfo=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 4 ++-- 1 file changed, 2 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 d13eaab18..eff8794bd 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 @@ -841,10 +841,10 @@ public class AppUserServiceImpl implements AppUserService { Result result = userFeignClient.getUserInfoById(tokenDto.getUserId()); if (result.success() && null != result.getData()) { EpdcCompleteUserInfoDTO dto = ConvertUtils.sourceToTarget(result.getData(), EpdcCompleteUserInfoDTO.class); - dto.setGridId(tokenDto.getGridId()); if (("0").equals(result.getData().getState())) { + dto.setGridId(tokenDto.getGridId()); //未完善信息获取用户当前所在的网格的后两级机构（社区-网格），返回给前端 - Result resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(tokenDto.getGridId()); + Result resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(dto.getGridId()); if (resultParentAndAllDeptDTO.success() && null != resultParentAndAllDeptDTO.getData()) { String allDeptNames = resultParentAndAllDeptDTO.getData().getAllDeptNames(); if (StringUtils.isNotBlank(allDeptNames)) {