From 499dfffcf6e41f558e80f57e16860e6fb2bdcb31 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 30 十一月 2023 10:40:16 +0800
Subject: [PATCH] 6
---
zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java b/zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java
index 8780f22..6151833 100644
--- a/zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java
+++ b/zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java
@@ -246,7 +246,6 @@
// 宸茬稉瀛樺湪瑭叉椹熶簡锛屼笉鐢ㄧ辜绾�
return;
}
-
WfDefStep currentStep = workflowConfigService.get(currentStepId);
WfDefStep finallyStep = this.queryWfDefFinallyStep(currentStep.getWfDefId().toString());
@@ -356,15 +355,17 @@
throw new RuntimeException("娌℃湁绗﹀悎(" + wfDef.getName() + ")娴佺▼鐨勪笅涓�姝�(" + currentStep.getName() + ")鎵ц浜猴紒");
}
- String updateSql = currentStep.getUpdateSql();
- if (org.apache.commons.lang3.StringUtils.isNotBlank(updateSql)) {
- updateSql = updateSql.replace("${bizId}", bizId.toString());
- updateSql = updateSql.replace("${bizId}", bizId.toString());
- updateSql = updateSql.replace("${nickName}", UserContext.getUser().getRealName());
- updateSql = updateSql.replace("${userId}", UserContext.getUser().getId().toString());
- baseDao.exeSql(updateSql);
+ WfDefStep prevStep = workflowConfigService.get(prevStepId);
+ if (prevStep!=null) {
+ String updateSql = prevStep.getUpdateSql();
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(updateSql)) {
+ updateSql = updateSql.replace("${bizId}", bizId.toString());
+ updateSql = updateSql.replace("${bizId}", bizId.toString());
+ updateSql = updateSql.replace("${nickName}", UserContext.getUser().getRealName());
+ updateSql = updateSql.replace("${userId}", UserContext.getUser().getId().toString());
+ baseDao.exeSql(updateSql);
+ }
}
-
} else {
taskParamDto.setUser(null);
taskParamDto.setGroupId2(null);
@@ -382,6 +383,18 @@
baseDao.exeSql(updateSql);
}
+ WfDefStep prevStep = workflowConfigService.get(prevStepId);
+ if (prevStep!=null) {
+ updateSql = prevStep.getUpdateSql();
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(updateSql)) {
+ updateSql = updateSql.replace("${bizId}", bizId.toString());
+ updateSql = updateSql.replace("${bizId}", bizId.toString());
+ updateSql = updateSql.replace("${nickName}", UserContext.getUser().getRealName());
+ updateSql = updateSql.replace("${userId}", UserContext.getUser().getId().toString());
+ baseDao.exeSql(updateSql);
+ }
+ }
+
if (!StringUtils.isBlank(currentStep.getNextFlows())) {
boolean canNext = true;
if (!StringUtils.isBlank(currentStep.getPreFlows())) {
--
Gitblit v1.9.1