From e490ff7a252f3ca3bd797de7e2f18c3a97a56474 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 9 Dec 2022 10:19:24 +0800 Subject: [PATCH] npe --- .../renren/modules/activiti/controller/HistoryController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java index b806fcb7..e046e710 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java @@ -210,7 +210,9 @@ public class HistoryController { TResourceMountApplyDTO tResourceMountApplyDTO = null; TDemandDataDTO tDemandDataDTO = null; ResourceDTO resourceDTO = null; - if (!activityDTO.getBusinessKey().startsWith("[") && !activityDTO.getBusinessKey().startsWith("{")) { // json 内容(批量申请) + if (StringUtils.isNotEmpty(activityDTO.getBusinessKey()) + && !activityDTO.getBusinessKey().startsWith("[") + && !activityDTO.getBusinessKey().startsWith("{")) { // json 内容(批量申请) tResourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(activityDTO.getBusinessKey())); tDemandDataDTO = tDemandDataService.get(Long.valueOf(activityDTO.getBusinessKey())); resourceDTO = resourceService.get(Long.valueOf(activityDTO.getBusinessKey()));