|
|
e308453482
|
Merge branch 'feature/dingdingLogin' into test
# Conflicts:
# workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/WpsUtil.java
# workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
|
2026-01-14 09:47:01 +08:00 |
|
|
|
f87ae7cdbc
|
feature/dingdingLogin: 新增钉钉授权
|
2026-01-13 18:04:17 +08:00 |
|
|
|
f62bc62975
|
Merge branch 'feature/RDMP-3845' into test
# Conflicts:
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
|
2026-01-05 16:28:17 +08:00 |
|
|
|
1a75fc4de3
|
feat(REQ-3845) - 调整处理wps 变量替换为空串的逻辑
|
2026-01-05 16:26:11 +08:00 |
|
|
|
64fdce63e0
|
Merge branch 'feature/RDMP-3845' into test
# Conflicts:
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
|
2026-01-05 14:48:53 +08:00 |
|
|
|
8557ceccb8
|
Merge remote-tracking branch 'origin/master' into feature/RDMP-3845
# Conflicts:
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
|
2026-01-05 14:40:36 +08:00 |
|
|
|
a8f986aab3
|
Merge branch 'feature/REQ-5965' into test
# Conflicts:
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
|
2025-12-25 16:31:00 +08:00 |
|
|
|
b486ed4927
|
feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑，配合审批业务中的替换为空的配置使用
|
2025-12-25 16:28:02 +08:00 |
|
|
|
4073edea3e
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-25 14:25:04 +08:00 |
|
|
|
1841d86b18
|
feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑，配合审批业务中的替换为空的配置使用
|
2025-12-25 14:23:26 +08:00 |
|
|
|
a144535411
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-25 11:11:04 +08:00 |
|
|
|
39ed649aa0
|
feat(REQ-5965) - 调整因为开放了更新业务变量后，导致最新 wps 变量替换不准确的问题
|
2025-12-25 11:09:29 +08:00 |
|
王粒
|
12f4be62bc
|
Merge branch 'feature/REQ-5965' into 'test'
feat(REQ-5965) - 调整审批业务变量未覆盖的问题
See merge request universal/infrastructure/backend/workflow-engine!27
|
2025-12-24 10:17:12 +00:00 |
|
|
|
f7234e9c11
|
feat(REQ-5965) - 调整审批业务变量未覆盖的问题
|
2025-12-24 18:16:19 +08:00 |
|
|
|
7d3605eea8
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-24 11:35:38 +08:00 |
|
|
|
9cce7f96af
|
feat(REQ-5965) - 更新变量
|
2025-12-23 11:04:23 +08:00 |
|
|
|
678048bf4a
|
feat(REQ-5965) - 更新变量
|
2025-12-23 10:51:17 +08:00 |
|
|
|
d3f845c49b
|
feat(REQ-5965) - 调整条件设置的类型
|
2025-12-23 10:37:20 +08:00 |
|
|
|
525c73b478
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-22 17:31:34 +08:00 |
|
|
|
66d348e67e
|
feat(REQ-5965) - 获取条件设置的值
|
2025-12-22 17:30:53 +08:00 |
|
|
|
4d22bba723
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-22 14:21:57 +08:00 |
|
|
|
ecdd054c12
|
feat(REQ-5965) - 调整处理条件变量字段的逻辑
|
2025-12-22 14:21:15 +08:00 |
|
|
|
191b137add
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-22 11:11:21 +08:00 |
|
|
|
94b9a0848c
|
feat(REQ-5965) - 兼容历史的存储模式
|
2025-12-22 11:08:40 +08:00 |
|
|
|
34d4cdea1e
|
feat(REQ-5965) - 调整单选复现条件的存储模式
|
2025-12-22 10:40:06 +08:00 |
|
|
|
a7dc35862a
|
Merge remote-tracking branch 'origin/master' into feature/REQ-5965
# Conflicts:
# workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java
|
2025-12-22 10:17:24 +08:00 |
|
|
|
f9ab24fcea
|
Merge remote-tracking branch 'origin/feature/REQ-5965' into feature/REQ-5965
# Conflicts:
# workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/WpsUtil.java
|
2025-12-22 10:00:14 +08:00 |
|
wangli
|
4ef1046798
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-20 10:49:10 +08:00 |
|
wangli
|
b85c2ac097
|
feat(REQ-5965) - 调整同意审批时记录审批人信息时 NPE 的异常
|
2025-12-20 10:48:44 +08:00 |
|
wangli
|
e7357ed208
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-19 23:42:27 +08:00 |
|
wangli
|
b94ca42ca0
|
feat(REQ-5965) - 优化审批同意时，记录操作人信息
|
2025-12-19 23:41:18 +08:00 |
|
wangli
|
ea37189820
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-19 23:16:59 +08:00 |
|
wangli
|
88b9e8e148
|
feat(REQ-5965) - 增加日志打印
|
2025-12-19 23:16:43 +08:00 |
|
|
|
5e0204cd73
|
feat(REQ-5965) - 新增wps 替换变量时，需要对无内存变量修改为空串
|
2025-12-19 18:10:43 +08:00 |
|
wangli
|
45b68217f3
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-19 11:23:53 +08:00 |
|
wangli
|
16bcecb62b
|
feat(REQ-5965) - 调整“查看文档”按钮无法正确打开业务传入的文档
|
2025-12-19 11:23:22 +08:00 |
|
|
|
168a8e7d4e
|
Merge branch 'feature/RDMP-3845' into test
|
2025-12-18 10:24:11 +08:00 |
|
|
|
98f560dc77
|
feat(REQ-3845) - 调整获取流程模型表单定义内容
|
2025-12-18 10:23:25 +08:00 |
|
|
|
dc44245550
|
Merge branch 'hotfix/async_cancel' into test
|
2025-12-10 19:54:16 +08:00 |
|
|
|
e6cb590f6a
|
fix - 异步撤回功能修复
|
2025-12-10 19:53:07 +08:00 |
|
|
|
6d597ca377
|
Merge branch 'feature/REQ-5865'
|
2025-12-10 11:21:04 +08:00 |
|
|
|
a6df8008a0
|
Merge branch 'feature/REQ-5250'
|
2025-12-10 11:20:52 +08:00 |
|
|
|
ab895b15de
|
Merge branch 'master' into feature/REQ-5250
|
2025-12-10 11:18:54 +08:00 |
|
|
|
5b625bbd83
|
Merge branch 'master' into feature/REQ-5865
|
2025-12-10 11:17:19 +08:00 |
|
|
|
493910d2a3
|
Merge branch 'feature/REQ-5865' into test
|
2025-12-08 10:27:34 +08:00 |
|
|
|
a49f9bad15
|
feat(REQ-5865) - 解决 triggerAsync 后，业务节点文案消失的问题
|
2025-12-08 10:20:01 +08:00 |
|
|
|
9a0945fac1
|
feat(REQ-5865) - 解决 triggerAsync 后，业务节点文案消失的问题
|
2025-12-04 17:25:30 +08:00 |
|
|
|
65540e1685
|
feat(REQ-5865) - 添加执行过程日志
|
2025-12-04 17:25:28 +08:00 |
|
|
|
7d85b3ebdd
|
feat(REQ-5865) - 解决 triggerAsync 后，业务节点文案消失的问题
|
2025-12-04 17:25:03 +08:00 |
|
|
|
0905bb396d
|
feat(REQ-5865) - 添加执行过程日志
|
2025-12-04 16:54:45 +08:00 |
|
