Skip to content

Commit

Permalink
[fix] 修复设计器驳回指定节点显示异常问题
Browse files Browse the repository at this point in the history
[fix] 流程实例查询SQL BUG
  • Loading branch information
minliuhua committed Dec 31, 2024
1 parent d50f968 commit ba0dc1c
Show file tree
Hide file tree
Showing 45 changed files with 67 additions and 63 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</p>


**项目代码、文档 均开源免费可商用 遵循开源协议即可**

**项目代码、文档 均开源免费可商用 遵循开源协议即可**
**开发完成请务必登记使用项目列表,[登记地址](https://gitee.com/dromara/warm-flow/issues/I7Y57D)**

## 介绍

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
<packaging>pom</packaging>

<name>warm-flow</name>
Expand Down
1 change: 1 addition & 0 deletions sql/mysql/v1-upgrade/warm-flow_1.3.7.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update flow_node set permission_flag = REPLACE(permission_flag,',','@@');
8 changes: 4 additions & 4 deletions sql/oracle/v1-upgrade/oracle-warm-flow_1.3.4.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
update flow_node set permission_flag = REPLACE(permission_flag,'@@default@@|','');
update flow_node set permission_flag = REPLACE(permission_flag,'@@spel@@|','');
update FLOW_NODE set PERMISSION_FLAG = REPLACE(PERMISSION_FLAG,'@@default@@|','');
update FLOW_NODE set PERMISSION_FLAG = REPLACE(PERMISSION_FLAG,'@@spel@@|','');

UPDATE flow_node SET permission_flag = REPLACE(permission_flag, '@@default@@|', '');
UPDATE flow_node SET permission_flag = REPLACE(permission_flag, '@@spel@@|', '');
UPDATE FLOW_NODE SET PERMISSION_FLAG = REPLACE(PERMISSION_FLAG, '@@default@@|', '');
UPDATE FLOW_NODE SET PERMISSION_FLAG = REPLACE(PERMISSION_FLAG, '@@spel@@|', '');
34 changes: 17 additions & 17 deletions sql/oracle/v1-upgrade/oracle-warm-flow_1.3.5.sql
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@eq@@|', 'eq|');
UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@eq@@', '|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@eq@@|', 'eq|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@eq@@', '|');

UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@ge@@|', 'ge|');
UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@ge@@', '|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@ge@@|', 'ge|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@ge@@', '|');

UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@gt@@|', 'gt|');
UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@gt@@', '|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@gt@@|', 'gt|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@gt@@', '|');

UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@le@@|', 'le|');
UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@le@@', '|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@le@@|', 'le|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@le@@', '|');

UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@like@@|', 'like|');
UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@like@@', '|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@like@@|', 'like|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@like@@', '|');

UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@lt@@|', 'lt|');
UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@lt@@', '|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@lt@@|', 'lt|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@lt@@', '|');

UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@ne@@|', 'ne|');
UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@ne@@', '|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@ne@@|', 'ne|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@ne@@', '|');

UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@notNike@@|', 'notNike|');
UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@notNike@@', '|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@notNike@@|', 'notNike|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@notNike@@', '|');

UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@spel@@|', 'spel|');
UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@spel@@|', 'spel|');

ALTER TABLE flow_node ADD any_node_skip VARCHAR2(100) DEFAULT NULL;

Expand Down
1 change: 1 addition & 0 deletions sql/oracle/v1-upgrade/oracle-warm-flow_1.3.7.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UPDATE FLOW_NODE SET PERMISSION_FLAG = REPLACE(PERMISSION_FLAG,',','@@');
1 change: 1 addition & 0 deletions sql/postgresql/v1-upgrade/postgresql-warm-flow_1.3.7.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UPDATE flow_node SET permission_flag = REPLACE(permission_flag,',','@@');
2 changes: 1 addition & 1 deletion warm-flow-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import org.dromara.warm.flow.core.FlowFactory;
import org.dromara.warm.flow.core.constant.ExceptionCons;
import org.dromara.warm.flow.core.constant.FlowCons;
import org.dromara.warm.flow.core.dao.FlowTaskDao;
import org.dromara.warm.flow.core.dto.FlowParams;
import org.dromara.warm.flow.core.entity.*;
Expand Down Expand Up @@ -346,7 +347,7 @@ public Task addTask(Node node, Instance instance, Definition definition, FlowPar
.setNodeName(node.getNodeName())
.setNodeType(node.getNodeType())
.setCreateTime(new Date())
.setPermissionList(StringUtils.str2List(node.getPermissionFlag(), ","));
.setPermissionList(StringUtils.str2List(node.getPermissionFlag(), FlowCons.splitAt));

if (StringUtils.isNotEmpty(node.getFormCustom()) && StringUtils.isNotEmpty(node.getFormPath())) {
// 节点有自定义表单则使用
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-orm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-orm</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-orm/warm-flow-easy-query/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-orm</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-easy-query</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-easy-query</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-easy-query-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-easy-query</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-easy-query-sb-starter</artifactId>
Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-easy-query-core</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-easy-query</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-easy-query-solon-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-orm/warm-flow-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-orm</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-jpa</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-orm/warm-flow-jpa/warm-flow-jpa-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-jpa</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-jpa-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-jpa</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-jpa-sb-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-jpa</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-jpa-solon-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-orm/warm-flow-mybatis-flex/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-orm</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-flex</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis-flex</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-flex-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis-flex</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-flex-sb-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis-flex</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-flex-sb3-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis-flex</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-flex-solon-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-orm/warm-flow-mybatis-plus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-orm</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-plus</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis-plus</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-plus-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis-plus</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-plus-sb-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis-plus</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis-plus</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-plus-solon-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-orm/warm-flow-mybatis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-orm</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-sb-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-sb3-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-mybatis</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-mybatis-solon-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-plugin/warm-flow-plugin-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-plugin</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-plugin-json</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-plugin/warm-flow-plugin-modes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-plugin</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-plugin-modes</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-plugin-modes</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-plugin-modes-sb</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-plugin-modes</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-plugin-modes-solon</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warm-flow-plugin/warm-flow-plugin-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-plugin</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-plugin-ui</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dromara.warm</groupId>
<artifactId>warm-flow-plugin-ui</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
</parent>

<artifactId>warm-flow-plugin-ui-core</artifactId>
Expand Down
Loading

0 comments on commit ba0dc1c

Please sign in to comment.