Commit Graph

896 Commits

Author SHA1 Message Date
YunaiV
752ed579c0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-12-27 10:21:42 +08:00
YunaiV
d860ca2c8c fix:【bpm】“refactor(bpm): 优化多实例行为初始化逻辑”导致的问题,对应 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1483/files 2025-12-26 21:23:47 +08:00
YunaiV
7c150f080c Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
2025-12-25 22:28:27 +08:00
YunaiV
6d1c1f2095 fix:【bpm】流程抄送时,可能缺少租户上下文的问题,对应 https://gitee.com/zhijiantianya/yudao-cloud/issues/IDEUQ6 2025-12-25 21:46:05 +08:00
YunaiV
6821986308 refactor(bpm): 优化多实例行为初始化逻辑 2025-12-25 09:51:40 +08:00
芋道源码
3ec32a61b0 !1483 refactor(bpm): 优化多实例行为初始化逻辑
Merge pull request !1483 from ssw/master-jdk17
2025-12-25 01:50:44 +00:00
YunaiV
efaa577556 fix:【bpm】getTaskManagerPage 接口的操作权限标识拼写错误 2025-12-25 09:14:59 +08:00
sisw
cae80cae31 refactor(bpm): 优化多实例行为初始化逻辑
- 将 collectionVariable 和 collectionElementVariable 的初始化移到构造函数中
- 避免在运行期修改 Behavior 实例状态
- 删除重复的变量设置代码
- 保留必要的注释说明字段用途
- 确保表达式和变量互斥关系正确处理
2025-12-22 14:45:52 +08:00
YunaiV
3143326b18 fix:【bpm】calculateUsersByActivity 忽略数据权限,避免过滤导致找不到候选人,对应 https://t.zsxq.com/8IG6p 2025-12-20 10:36:59 +08:00
YunaiV
91870831d2 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-12-07 10:38:30 +08:00
YunaiV
cdc4255da1 fix:【bpm】更改 moveActivityIdsToSingleActivityId 传入的第一个参数,对应 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1466/ 2025-11-29 18:56:42 +08:00
zz
aee514cf33 fix(bpm): 更改 moveActivityIdsToSingleActivityId 传入的第一个参数 2025-11-28 11:58:08 +08:00
YunaiV
755d5e48cc Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-11-26 18:49:11 +08:00
YunaiV
bdb4e3fadc fix:【bpm】flowable 7.2.0 驳回可使用 moveActivityIdsToSingleActivityId 方法 2025-11-25 08:55:59 +08:00
YunaiV
ec0c4eebdb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-11-24 17:03:53 +08:00
YunaiV
9fe1ce8e1a chore:flowable from 7.0.1 to 7.2.0 2025-11-23 17:36:28 +08:00
YunaiV
c34c218bb5 fix:【bpm】只能退回到已经处理过的节点(排除审批未经过的节点)。相关 issue:https://github.com/YunaiV/ruoyi-vue-pro/issues/982 2025-11-23 12:04:42 +08:00
YunaiV
fe186da113 fix:【bpm】流程操作时,增加数据权限的忽略 2025-11-23 10:11:38 +08:00
YunaiV
d34dd35eab fix:【bpm】流程操作时,增加数据权限的忽略 2025-11-23 10:11:34 +08:00
YunaiV
d592080f3f fix:【bpm工作流】BpmProcessInstanceCopyServiceImpl抄送时参数顺序错误的问题#273 2025-11-21 20:32:37 +08:00
YunaiV
485a70de6d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
2025-11-21 20:04:46 +08:00
YunaiV
5f993c6a9f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
2025-11-21 16:41:37 +08:00
jason
dace9cfed5 perf: [BPM 工作流] 驳回预测 review 修改 2025-10-12 16:28:49 +08:00
jason
27235016ad perf: [BPM 工作流] 驳回预测 review 修改 2025-10-12 16:20:37 +08:00
YunaiV
6aba222d9e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceServiceInvokeSceneRuleAction.java
2025-10-12 11:04:05 +08:00
YunaiV
4fed75935f review:【bpm 工作流】驳回的优化 2025-10-12 11:02:03 +08:00
YunaiV
a1cb21f3b1 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
2025-10-12 10:58:36 +08:00
jason
65b8114799 perf: [BPM 工作流] 驳回预测 review 修改 2025-10-10 23:07:40 +08:00
jason
2cb726449e perf: [BPM 工作流] 驳回预测 review 修改 2025-10-10 23:06:07 +08:00
jason
120736e393 fix: [BPM 工作流] 驳回预测 review 修改 2025-10-10 10:48:54 +08:00
YunaiV
c80ffe437f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
2025-10-02 18:52:15 +08:00
YunaiV
8a7ae8d726 feat:【bpm 工作流】发起流程时,基于发起人作为条件的预测 2025-10-02 16:06:03 +08:00
YunaiV
c0330ae6c5 fix: 【mall 商城】分销提现的错误码重叠问题(不影响提示内容) 2025-10-02 10:27:57 +08:00
YunaiV
b07bc3d787 fix:【bpm 工作流】已办任务的审批状态过滤不正确 2025-10-02 09:36:01 +08:00
YunaiV
5e46e0c4f8 review:【bpm 工作流】驳回场景下的预测 2025-10-01 15:35:06 +08:00
YunaiV
1dc5fd2c24 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
2025-10-01 09:52:21 +08:00
YunaiV
a4e230828f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm
2025-10-01 09:50:48 +08:00
jason
c2f9bad3ad Merge remote-tracking branch 'origin/develop' into develop 2025-09-27 20:59:06 +08:00
jason
8be3a3f87e perf: [BPM 工作流] 优化回退操作,流程预测不准确的问题 2025-09-27 20:56:10 +08:00
YunaiV
b8ad3d6829 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
2025-09-20 21:33:57 +08:00
YunaiV
455a012644 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java
2025-09-20 21:32:03 +08:00
YunaiV
66d9abeabe fix:【bpm 工作流】定时边界事件固定日期和固定时长参数传反问题 2025-09-20 18:14:30 +08:00
YunaiV
f441de534b fix:【bpm 工作流】流程自定义 ID 序号,无 infix 前缀时,永不过期,可见 https://t.zsxq.com/MU1E2 讨论 2025-09-20 12:30:18 +08:00
dylannier
4eae5bd09b fix: 【BPM 工作流】定时边界事件固定日期和固定时长参数传反问题 2025-09-10 11:15:43 +08:00
YunaiV
256b6f2c1d review:【bpm 工作流】流程打印 2025-09-07 17:22:10 +08:00
Lesan
304aa30a5e feat: 代码评审修改 2025-09-06 10:37:00 +08:00
YunaiV
1c508add92 review:【bpm 工作流】流程打印 2025-09-04 22:53:16 +08:00
Lesan
a8223738db feat: 代码评审修改 2025-09-04 09:21:19 +08:00
YunaiV
9b426436be review:【bpm 工作流】流程打印 2025-09-03 13:24:54 +08:00
芋道源码
0983d5b5cd !1418 流程打印
Merge pull request !1418 from Lesan/feature/bpm-打印
2025-09-03 01:56:46 +00:00