From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期三, 29 十一月 2023 17:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 fb05ff9..8780f22 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
@@ -355,6 +355,16 @@
if (existsUsers.size() == 0) {
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);
+ }
+
} else {
taskParamDto.setUser(null);
taskParamDto.setGroupId2(null);
@@ -367,7 +377,8 @@
if (org.apache.commons.lang3.StringUtils.isNotBlank(updateSql)) {
updateSql = updateSql.replace("${bizId}", bizId.toString());
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);
}
--
Gitblit v1.9.1