prepareComplete接口修改

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

@@ -840,6 +840,8 @@ 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())) {
                 //未完善信息获取用户当前所在的网格的后两级机构（社区-网格），返回给前端
                 Result<ParentAndAllDeptDTO> resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(tokenDto.getGridId());
@@ -847,7 +849,7 @@ public class AppUserServiceImpl implements AppUserService {
                     String allDeptNames = resultParentAndAllDeptDTO.getData().getAllDeptNames();
                     if (StringUtils.isNotBlank(allDeptNames)) {
                         String gridName = allDeptNames.substring(allDeptNames.lastIndexOf("-", allDeptNames.lastIndexOf("-") - 1) + 1);
-                        result.getData().setGrid(gridName);
+                        dto.setGridName(gridName);
                     }
                 }
             } else {
@@ -855,11 +857,9 @@ public class AppUserServiceImpl implements AppUserService {
                 String allDeptNames = result.getData().getAllDeptNames();
                 if (StringUtils.isNotBlank(allDeptNames)) {
                     String gridName = allDeptNames.substring(allDeptNames.lastIndexOf("-", allDeptNames.lastIndexOf("-") - 1) + 1);
-                    result.getData().setGrid(gridName);
+                    dto.setGridName(gridName);
                 }
             }
-            EpdcCompleteUserInfoDTO dto = ConvertUtils.sourceToTarget(result.getData(), EpdcCompleteUserInfoDTO.class);
-            dto.setGridId(tokenDto.getGridId());
             return new Result<EpdcCompleteUserInfoDTO>().ok(dto);
         }
         return new Result().error("获取用户信息失败");