diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java index fbeac35..23c2831 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/MainInfoController.java @@ -114,7 +114,15 @@ public class MainInfoController { )); } } - DeptDO dept = deptService.getDept(mainInfo.getCompanyId()); + + String companyName = ""; + if (mainInfo.getWorkerCompanyId() != null) { + DeptDO dept = deptService.getDept(mainInfo.getWorkerCompanyId()); + if (dept != null) { + companyName = dept.getName(); + } + } + Set userIds = new HashSet<>(); if (mainInfo.getCoHandlers() != null) { mainInfo.getCoHandlers().stream() @@ -123,7 +131,7 @@ public class MainInfoController { } userIds.add(mainInfo.getUserId()); Map userMap = adminUserApi.getUserMap(userIds); - return success(MainInfoConvert.INSTANCE.buildMainInfo(mainInfo, attachmentMap, dept.getName(), userMap)); + return success(MainInfoConvert.INSTANCE.buildMainInfo(mainInfo, attachmentMap, companyName, userMap)); } @GetMapping("/page")