Commit Graph

3076 Commits

Author SHA1 Message Date
e7eca766b6 Merge branch 'feature/REQ-5965' into pre 2025-12-25 16:31:25 +08:00
b486ed4927 feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑,配合审批业务中的替换为空的配置使用 2025-12-25 16:28:02 +08:00
dc596d7841 Merge branch 'feature/REQ-5965' into pre 2025-12-25 14:25:39 +08:00
1841d86b18 feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑,配合审批业务中的替换为空的配置使用 2025-12-25 14:23:26 +08:00
9bb533147d Merge branch 'feature/REQ-5965' into pre 2025-12-25 13:56:02 +08:00
15644c382e feat(REQ-5965) - 增加一些日志打印 2025-12-25 13:54:49 +08:00
4b3991bfbe Merge branch 'feature/REQ-5965' into pre 2025-12-25 11:26:39 +08:00
46dd5ceee5 feat(REQ-5965) - 调整审批日志打印功能日志筛选 2025-12-25 11:24:55 +08:00
ab09a5ee35 Merge branch 'feature/REQ-5965' into pre 2025-12-25 11:11:58 +08:00
39ed649aa0 feat(REQ-5965) - 调整因为开放了更新业务变量后,导致最新 wps 变量替换不准确的问题 2025-12-25 11:09:29 +08:00
5a8a66c11f Merge branch 'feature/REQ-5965' into pre 2025-12-25 10:59:22 +08:00
02a067d49c feat(REQ-5965) - 调整过滤用于替换 wps 文档变量的逻辑 2025-12-25 10:58:20 +08:00
3c1ef038b2 Merge branch 'feature/REQ-5965' into pre 2025-12-24 20:32:11 +08:00
1e80220544 feat(REQ-5965) - 补充接口入参日志打印 2025-12-24 20:30:13 +08:00
0a87a0633e Merge branch 'feature/REQ-5965' into pre 2025-12-24 18:17:26 +08:00
f7234e9c11 feat(REQ-5965) - 调整审批业务变量未覆盖的问题 2025-12-24 18:16:19 +08:00
7374ce4236 Merge branch 'feature/REQ-5965' into pre 2025-12-23 18:23:25 +08:00
68ec1d0be1 feat(REQ-5965) - 更新条件的 defaultValue 数据类型 2025-12-23 14:29:10 +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
66d348e67e feat(REQ-5965) - 获取条件设置的值 2025-12-22 17:30:53 +08:00
ecdd054c12 feat(REQ-5965) - 调整处理条件变量字段的逻辑 2025-12-22 14:21:15 +08:00
f5415dd354 feat(REQ-5965) - 处理图片类型为空时,设置为透明默认图 2025-12-22 14:14:10 +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
b85c2ac097 feat(REQ-5965) - 调整同意审批时记录审批人信息时 NPE 的异常 2025-12-20 10:48:44 +08:00
wangli
3b1c1b3ba8 feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时,丢失属性的情况 2025-12-20 02:26:54 +08:00
wangli
1e4d9dcca5 feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时,丢失属性的情况 2025-12-20 02:24:39 +08:00
wangli
6bf313d78a feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时,丢失属性的情况 2025-12-20 01:54:13 +08:00
wangli
e322a62002 feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时,丢失属性的情况 2025-12-20 01:41:21 +08:00
wangli
8b7a79b8d0 feat(REQ-5965) - 调整业务自定义文档在存入 process_sign 表时,丢失属性的情况 2025-12-20 01:13:11 +08:00
wangli
5b769faf6e feat(REQ-5965) - 优化审批同意时,记录操作人信息 2025-12-20 00:34:11 +08:00
wangli
b94ca42ca0 feat(REQ-5965) - 优化审批同意时,记录操作人信息 2025-12-19 23:41:18 +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
cef429d4ab feat(REQ-5965) - 调整模型更新时,条件权限的数据类型 2025-12-19 17:55:46 +08:00
7d53d2ad71 feat(REQ-5965) - 调整按照工程过滤时,由于开启了过滤,但未传入工程导致的 NPE 2025-12-19 16:35:37 +08:00
wangli
16bcecb62b feat(REQ-5965) - 调整“查看文档”按钮无法正确打开业务传入的文档 2025-12-19 11:23:22 +08:00
fa1acf573d feat(REQ-5965) - 调整创建审批的入参,支持业务文档可以不进行变量替换 2025-12-18 11:22:44 +08:00
3b22ee03a1 Merge branch 'hotfix/async_cancel' into pre 2025-12-11 15:40:48 +08:00
345f55898d fix - 修复驳回功能导致卡片异常 2025-12-11 15:38:52 +08:00
e6cb590f6a fix - 异步撤回功能修复 2025-12-10 19:53:07 +08:00
0c54ec8512 Merge branch 'master' into pre 2025-12-10 12:35:08 +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