From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:47:00 +0800
Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 78a241f..fb5e489 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
@@ -1155,19 +1155,21 @@
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
.processInstanceId(flowTaskDto.getProcInsId())
.singleResult();
- SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
- 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) {
- flowTaskDto.setTodoUsers("");
- } else {
- //鍘婚櫎[]
- flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
- flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\"", ""));
+ if (historicProcessInstance != null) {
+ SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
+ 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) {
+ flowTaskDto.setTodoUsers("");
+ } else {
+ //鍘婚櫎[]
+ flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
+ flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\"", ""));
+ }
}
});
IPage<FlowTaskDto> flowTaskDtoIPage = new Page<>();
--
Gitblit v1.9.3