From 7edd5ae2fd1d2f15f9ff88d7acd029da5a1c47dc Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 13 May 2022 10:03:57 +0800
Subject: [PATCH] ...

---
 .../io/renren/modules/activiti/service/ActHistoryService.java | 4 +++-
 .../resourceMountApply/dto/TResourceMountApplyDTO.java        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 8d27c106..18734347 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
@@ -267,10 +267,12 @@ public class ActHistoryService {
                     dto.setResourceId(abilityApplicationDTO.getResourceId());
                 } else {
                     TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
-                    if (resourceMountApplyDTO != null && resourceMountApplyDTO.getResourceDTO() != null) {
+                    if (resourceMountApplyDTO != null && resourceMountApplyDTO.getResourceDTO() != null
+                            && resourceMountApplyDTO.getResourceDTO().getId() != null) {
                         dto.setName(resourceMountApplyDTO.getResourceDTO().getName());
                         dto.setResourceId(resourceMountApplyDTO.getResourceDTO().getId().toString());
                     } else {
+                        logger.error("resourceMountApplyDTO:" + resourceMountApplyDTO != null ? resourceMountApplyDTO.toString() : "");
                         ResourceDTO resourceDTO = resourceService.get(Long.valueOf(dto.getBusinessKey()));
                         if (resourceDTO != null) {
                             dto.setName(resourceDTO.getName());
diff --git a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceMountApplyDTO.java b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceMountApplyDTO.java
index f27c946a..174a9a2d 100644
--- a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceMountApplyDTO.java
+++ b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceMountApplyDTO.java
@@ -47,7 +47,7 @@ public class TResourceMountApplyDTO implements Serializable {
         if (this.parameterContent != null) {
             return JSON.parseObject(this.parameterContent, ResourceDTO.class);
         }
-        return resourceDTO;
+        return null;
     }
 
     public void setResourceDTO(ResourceDTO resourceDTO) {