diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 3f4bf17..cb2a486 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -693,7 +693,7 @@ public class IReportServiceImpl extends ServiceImpl String[] idArray = department.split(","); List orgEOList = orgEOService.query().in("ID", idArray).list(); if (CollectionUtils.isNotEmpty(orgEOList)) { - String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); + String departmentName = orgEOList.stream().map(OrgEO::getLongName).collect(Collectors.joining(",")); reportDetailVo.setDepartmentName(departmentName); } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java index e4a3457..101d1c8 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java @@ -101,7 +101,7 @@ public class TaskController { historicTaskInstance.put("assignee", assignee.getUsname()); historicTaskInstance.put("assigneeId", assignee.getUsid()); if(assignee.getOrgEOList().size()>0){ - historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0).getOrgName()); + historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0).getLongName()); } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); @@ -118,7 +118,7 @@ public class TaskController { UserVO userById = userEoService.getUserByIdNodel(busProcessEntrust.getEnUserId()); String enUserName = userById.getUsname(); if(userById.getOrgEOList().size()>0){ - map.put("orgName",userById.getOrgEOList().get(0).getOrgName()); + map.put("orgName",userById.getOrgEOList().get(0).getLongName()); } map.put("name",historicTaskInstance.get("name")); map.put("assignee", enUserName+"(" + consigner + " 委托)");