Commit Graph

3120 Commits

Author SHA1 Message Date
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
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
王粒
5a9ac44892 Merge branch 'feature/REQ-5965' into 'test'
feat(REQ-5965) - 调整模型更新时,条件权限的数据类型

See merge request universal/infrastructure/backend/workflow-engine!26
2025-12-19 09:56:31 +00:00
cef429d4ab feat(REQ-5965) - 调整模型更新时,条件权限的数据类型 2025-12-19 17:55:46 +08:00
王粒
93b9236b19 Merge branch 'feature/REQ-5965' into 'test'
feat(REQ-5965) - 调整按照工程过滤时,由于开启了过滤,但未传入工程导致的 NPE

See merge request universal/infrastructure/backend/workflow-engine!24
2025-12-19 08:36:18 +00:00
7d53d2ad71 feat(REQ-5965) - 调整按照工程过滤时,由于开启了过滤,但未传入工程导致的 NPE 2025-12-19 16:35:37 +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
68f7da71d2 Merge branch 'feature/REQ-5965' into test 2025-12-18 11:23:44 +08:00
fa1acf573d feat(REQ-5965) - 调整创建审批的入参,支持业务文档可以不进行变量替换 2025-12-18 11:22:44 +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
f7451d083f Merge branch 'hotfix/async_cancel' into test 2025-12-10 19:51:57 +08:00
836a95cef8 feat(REQ-5865) - 调整实例完成的相关日志 2025-12-10 12:34:39 +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