From ea9ca0ef5707dfa9e3e404049372a121ce03fb2d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 05 八月 2021 22:54:57 +0800
Subject: [PATCH] 优化日志记录bug
---
service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 08fbc99..b261255
--- a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
@@ -3,8 +3,8 @@
import com.java110.common.dao.IWorkflowServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.common.IWorkflowInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.workflow.WorkflowAuditInfoDto;
@@ -524,9 +524,12 @@
HistoricProcessInstance hisProcessInstance = (HistoricProcessInstance) historyService
.createHistoricProcessInstanceQuery()
.processInstanceBusinessKey(workflowAuditInfoDto.getBusinessKey()).singleResult();
- // 璇ユ祦绋嬪疄渚嬬殑鎵�鏈夎妭鐐瑰鎵硅褰�
- List<HistoricActivityInstance> hisActInstList = getHisUserTaskActivityInstanceList(hisProcessInstance
- .getId());
+ List<HistoricActivityInstance> hisActInstList = new ArrayList<>();
+ if (hisProcessInstance != null) {
+ // 璇ユ祦绋嬪疄渚嬬殑鎵�鏈夎妭鐐瑰鎵硅褰�
+ hisActInstList = getHisUserTaskActivityInstanceList(hisProcessInstance
+ .getId());
+ }
List<WorkflowAuditInfoDto> workflowAuditInfoDtos = new ArrayList<>();
WorkflowAuditInfoDto tmpWorkflowAuditInfoDto = null;
for (Iterator iterator = hisActInstList.iterator(); iterator.hasNext(); ) {
@@ -559,7 +562,7 @@
msg += (comment.getFullMessage() + "/");
}
}
- msg = msg.endsWith("/") ? msg.substring(0, msg.length() - 2) : msg;
+ msg = msg.endsWith("/") ? msg.substring(0, msg.length() - 1) : msg;
tmpWorkflowAuditInfoDto.setUserId(activityInstance.getAssignee());
tmpWorkflowAuditInfoDto.setMessage(msg);
workflowAuditInfoDtos.add(tmpWorkflowAuditInfoDto);
--
Gitblit v1.8.0