From f401c17e3a857bb0dc9f7ca2ea5b1797d253b496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=90=AC=E7=A0=96=E7=9A=84=E5=B0=8F=E5=BA=84?= <1909017815@qq.com> Date: Wed, 10 Dec 2025 10:48:49 +0000 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=8A=82=E7=82=B9=E9=87=8D=E5=A4=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 搬砖的小庄 <1909017815@qq.com> --- .../workflow/service/impl/FlwTaskServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 5186bffea..003203c99 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -527,20 +527,19 @@ public class FlwTaskServiceImpl implements IFlwTaskService { } //获取可驳回的前置节点 List nodes = nodeService.previousNodeList(task.getDefinitionId(), nowNodeCode); - List taskList = hisTaskService.getByInsId(task.getInstanceId()); - + List hisTaskList = hisTaskService.getByInsId(task.getInstanceId()); Map nodeMap = StreamUtils.toIdentityMap(nodes, Node::getNodeCode); + Set added = new HashSet<>(); List backNodeList = new ArrayList<>(); - for (HisTask hisTask : taskList) { + for (HisTask hisTask : hisTaskList) { Node nodeValue = nodeMap.get(hisTask.getNodeCode()); - if (nodeValue != null) { + if (nodeValue != null && NodeType.BETWEEN.getKey().equals(nodeValue.getNodeType()) && added.add(nodeValue.getNodeCode())) { backNodeList.add(nodeValue); } } if (CollUtil.isNotEmpty(backNodeList)) { - List prefixOrSuffixNodes = StreamUtils.filter(backNodeList, e -> NodeType.BETWEEN.getKey().equals(e.getNodeType())); - Collections.reverse(prefixOrSuffixNodes); - return prefixOrSuffixNodes; + Collections.reverse(backNodeList); + return backNodeList; } return nodes; } From 079e76ffd5123936ec3900ade2de3b5f02697824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=90=AC=E7=A0=96=E7=9A=84=E5=B0=8F=E5=BA=84?= <1909017815@qq.com> Date: Wed, 10 Dec 2025 10:57:15 +0000 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9EMP=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E4=B8=8D=E6=9B=B4=E6=96=B0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 搬砖的小庄 <1909017815@qq.com> --- .../dromara/common/mybatis/core/domain/BaseEntity.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java index 13a794162..18cbdf2ea 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java @@ -1,6 +1,7 @@ package org.dromara.common.mybatis.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -33,19 +34,19 @@ public class BaseEntity implements Serializable { /** * 创建部门 */ - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.NEVER) private Long createDept; /** * 创建者 */ - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.NEVER) private Long createBy; /** * 创建时间 */ - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.NEVER) private Date createTime; /** @@ -67,4 +68,4 @@ public class BaseEntity implements Serializable { @TableField(exist = false) private Map params = new HashMap<>(); -} +} \ No newline at end of file