diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java index f8e5c1ad..4604ead3 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java @@ -6,6 +6,8 @@ import io.renren.modules.activiti.dto.ProcessInstanceDTO; import io.renren.modules.activiti.dto.TaskDTO; import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.service.TAbilityApplicationService; +import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO; +import io.renren.modules.resourceMountApply.service.TResourceMountApplyService; import io.renren.modules.security.user.SecurityUser; import io.renren.modules.sys.dto.SysUserDTO; import io.renren.modules.sys.service.SysUserService; @@ -65,6 +67,9 @@ public class ActHistoryService { @Autowired protected TaskService taskService; + @Autowired + private TResourceMountApplyService tResourceMountApplyService; + @Autowired private SysUserService sysUserService; @@ -257,6 +262,12 @@ public class ActHistoryService { if (abilityApplicationDTO1 != null) { dto.setName(abilityApplicationDTO1.getSystem()); dto.setResourceId(abilityApplicationDTO.getResourceId()); + } else { + TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey())); + if (resourceMountApplyDTO != null) { + dto.setName(resourceMountApplyDTO.getResourceDTO().getName()); + dto.setResourceId(resourceMountApplyDTO.getResourceDTO().getId().toString()); + } } } if (dto.isEnded()) { // 已结束