From 35c848b7196c0aceadb229df4db09114d88aba57 Mon Sep 17 00:00:00 2001 From: "radish@2020" <377967926@qq.com> Date: Tue, 21 Oct 2025 16:38:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsql=EF=BC=8Cmysql5?= =?UTF-8?q?.7=E7=9A=84TEXT=E7=B1=BB=E5=9E=8B=E4=B8=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/sql/update/2025-09-30-流程编排.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/sql/update/2025-09-30-流程编排.sql b/script/sql/update/2025-09-30-流程编排.sql index 747d73e3..8532a817 100644 --- a/script/sql/update/2025-09-30-流程编排.sql +++ b/script/sql/update/2025-09-30-流程编排.sql @@ -3,7 +3,7 @@ CREATE TABLE t_workflow id BIGINT AUTO_INCREMENT PRIMARY KEY, uuid VARCHAR(32) NOT NULL DEFAULT '', title VARCHAR(100) NOT NULL DEFAULT '', - remark TEXT NOT NULL DEFAULT '', + remark TEXT NOT NULL, user_id BIGINT NOT NULL DEFAULT 0, is_public TINYINT(1) NOT NULL DEFAULT 0, is_enable TINYINT(1) NOT NULL DEFAULT 1, From 6b5fea27e014440d9d7ea9b53c503ff6c2e2571b Mon Sep 17 00:00:00 2001 From: "radish@2020" <377967926@qq.com> Date: Tue, 21 Oct 2025 18:00:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E6=89=A7=E8=A1=8C=E6=8A=A5=E9=94=99=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E7=94=A8=E6=88=B7=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/ruoyi/workflow/workflow/WorkflowUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules-api/ruoyi-workflow-api/src/main/java/org/ruoyi/workflow/workflow/WorkflowUtil.java b/ruoyi-modules-api/ruoyi-workflow-api/src/main/java/org/ruoyi/workflow/workflow/WorkflowUtil.java index b4d96b57..adbd581b 100644 --- a/ruoyi-modules-api/ruoyi-workflow-api/src/main/java/org/ruoyi/workflow/workflow/WorkflowUtil.java +++ b/ruoyi-modules-api/ruoyi-workflow-api/src/main/java/org/ruoyi/workflow/workflow/WorkflowUtil.java @@ -123,14 +123,14 @@ public class WorkflowUtil { Set nameSet = CollStreamUtil.toSet(refInputs, WfNodeParamRef::getName); userMessage.stream().filter(item -> nameSet.contains(item.getName())) - .map(item -> getMessage("role", item.getContent().getValue())).forEach(messages::add); + .map(item -> getMessage("user", item.getContent().getValue())).forEach(messages::add); if (CollUtil.isNotEmpty(messages)) { return; } userMessage.stream().filter(item -> "input".equals(item.getName())) - .map(item -> getMessage("role", item.getContent().getValue())).forEach(messages::add); + .map(item -> getMessage("user", item.getContent().getValue())).forEach(messages::add); } /**