|
|
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 |
|
|
|
e93e854fef
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-25 13:55:37 +08:00 |
|
|
|
15644c382e
|
feat(REQ-5965) - 增加一些日志打印
|
2025-12-25 13:54:49 +08:00 |
|
|
|
800f6f51c5
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-25 11:26:21 +08:00 |
|
|
|
46dd5ceee5
|
feat(REQ-5965) - 调整审批日志打印功能日志筛选
|
2025-12-25 11:24:55 +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 |
|
|
|
9a596135af
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-25 10:58:37 +08:00 |
|
|
|
02a067d49c
|
feat(REQ-5965) - 调整过滤用于替换 wps 文档变量的逻辑
|
2025-12-25 10:58:20 +08:00 |
|
|
|
0616610ccb
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-24 20:31:46 +08:00 |
|
|
|
1e80220544
|
feat(REQ-5965) - 补充接口入参日志打印
|
2025-12-24 20:30:13 +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 |
|
|
|
68ec1d0be1
|
feat(REQ-5965) - 更新条件的 defaultValue 数据类型
|
2025-12-23 14:29:10 +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 |
|
|
|
a45dd82be6
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-22 14:15:14 +08:00 |
|
|
|
f5415dd354
|
feat(REQ-5965) - 处理图片类型为空时，设置为透明默认图
|
2025-12-22 14:14:10 +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 |
|
|
|
05e7ad4563
|
feat(REQ-5965) - 调整原来的方法
|
2025-12-22 10:15:33 +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
|
bdb8add5b1
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-20 02:27:03 +08:00 |
|
wangli
|
3b1c1b3ba8
|
feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时，丢失属性的情况
|
2025-12-20 02:26:54 +08:00 |
|
wangli
|
9dce16923c
|
feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时，丢失属性的情况
|
2025-12-20 02:26:43 +08:00 |
|
wangli
|
694b2a3660
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-20 02:24:49 +08:00 |
|
wangli
|
1e4d9dcca5
|
feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时，丢失属性的情况
|
2025-12-20 02:24:39 +08:00 |
|
wangli
|
2b62c09a2f
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-20 01:54:29 +08:00 |
|
wangli
|
6bf313d78a
|
feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时，丢失属性的情况
|
2025-12-20 01:54:13 +08:00 |
|
wangli
|
2f59638b7c
|
feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时，丢失属性的情况
|
2025-12-20 01:53:56 +08:00 |
|
wangli
|
bd4b2c9a2b
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-20 01:41:34 +08:00 |
|
wangli
|
e322a62002
|
feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时，丢失属性的情况
|
2025-12-20 01:41:21 +08:00 |
|
wangli
|
a6837d6b6f
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-20 01:13:26 +08:00 |
|
wangli
|
8b7a79b8d0
|
feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时，丢失属性的情况
|
2025-12-20 01:13:11 +08:00 |
|
wangli
|
a1e3867171
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-20 00:34:24 +08:00 |
|
wangli
|
5b769faf6e
|
feat(REQ-5965) - 优化审批同意时，记录操作人信息
|
2025-12-20 00:34:11 +08:00 |
|
wangli
|
e7357ed208
|
Merge branch 'feature/REQ-5965' into test
|
2025-12-19 23:42:27 +08:00 |
|
