prepareCompleteUserInfo修改

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<UserDTO> 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<ParentAndAllDeptDTO> resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(tokenDto.getGridId());
+                Result<ParentAndAllDeptDTO> resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(dto.getGridId());
                 if (resultParentAndAllDeptDTO.success() && null != resultParentAndAllDeptDTO.getData()) {
                     String allDeptNames = resultParentAndAllDeptDTO.getData().getAllDeptNames();
                     if (StringUtils.isNotBlank(allDeptNames)) {