From a3fa685014ca577779c47aa540a7735ae58fb30d Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 26 五月 2025 11:49:18 +0800
Subject: [PATCH] 工具入库申请功能
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
index c39da7c..6b715e9 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
@@ -678,6 +678,9 @@
try {
// 寮哄埗缁撴潫娴佺▼瀹炰緥
runtimeService.deleteProcessInstance(processInstanceId, deleteReason);
+ // 鍒犻櫎鍏宠仈娴佺▼鐨勪笟鍔�
+ FlowMyBusiness flowMyBusiness=flowMyBusinessService.getFlowMyBusiness(processInstanceId);
+ flowMyBusinessService.removeById(flowMyBusiness.getId());
System.out.println("Process instance with ID " + processInstanceId + " has been forcefully ended.");
} catch (Exception e) {
System.err.println("Failed to force end process instance: " + e.getMessage());
@@ -1066,8 +1069,10 @@
.processInstanceId(flowTaskDto.getProcInsId())
.singleResult();
SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
- flowTaskDto.setStartUserId(startUser.getUsername());
- flowTaskDto.setStartUserName(startUser.getRealname());
+ if (startUser!=null){
+ flowTaskDto.setStartUserId(startUser.getUsername());
+ flowTaskDto.setStartUserName(startUser.getRealname());
+ }
List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId());
flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername,"锛�"));
if (flowTaskDto.getTodoUsers() == null){
--
Gitblit v1.9.3