From ca33bb0576cbcb2c8fe4c2226660df52848c58ed Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 5 May 2022 10:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E8=B5=84=E6=BA=90=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=20=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/service/ActHistoryService.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

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()) { // 已结束