|
|
cd56960790
|
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/thingmodel/IotThingModelServiceImpl.java
# yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java
# yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
|
2026-05-31 19:35:10 +08:00 |
|
|
|
688de72367
|
fix(bpm): 修复流程摘要解析展示组件时报错
- 表单字段 JSON 改为按 JsonNode 逐个节点递归解析
- 跳过分割线、标签、文字等展示组件的字符串 children
- 默认摘要按表单字段配置顺序取前三个真实字段
- 补充流程摘要解析单元测试，覆盖 DB form_fields 常见格式
对应 https://t.zsxq.com/x1UrW
|
2026-05-31 19:14:59 +08:00 |
|
|
|
b6be0775fd
|
Merge branch 'feat/mes' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2026-05-10 09:34:41 +08:00 |
|
|
|
87ce69fe90
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2026-05-04 10:01:08 +08:00 |
|
|
|
1287ce90e3
|
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
|
2026-05-03 16:25:44 +08:00 |
|
|
|
0eb60e00da
|
!1519 条件节点添加包含和不包含操作符
|
2026-05-03 11:00:17 +08:00 |
|
|
|
3686ef82d5
|
!1519 条件节点添加包含和不包含操作符
Merge pull request !1519 from Lesan/bugfix/bpm-202602
|
2026-05-03 02:53:23 +00:00 |
|
|
|
12e8eaba55
|
fix(bpm): 修复流程实例抄送功能中的用户映射逻辑
|
2026-05-03 09:54:38 +08:00 |
|
|
|
cd5bdb076d
|
fix(bpm): 修复流程实例抄送功能中的用户映射逻辑
|
2026-04-15 15:50:43 +08:00 |
|
|
|
33783bf962
|
OA审批示例实体类字段类型与VO不一致问题修改，Postgres不会自动转换类型
|
2026-04-08 20:08:03 +08:00 |
|
|
|
bd73cfdf95
|
feat: 条件表达式操作符使用枚举表示
|
2026-04-04 11:11:43 +08:00 |
|
|
|
7d1a33ca89
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/app/tenant/AppTenantController.java
|
2026-03-08 10:08:26 +08:00 |
|
|
|
ba6cdabe62
|
fix(bpm): 串行多实例审批使用 LinkedHashSet 保证审批人顺序
|
2026-03-07 18:01:11 +08:00 |
|
|
|
07a879fd1f
|
fix: 处理布局组件可能存在children导致摘要无法展示表单字段
|
2026-02-15 12:12:03 +08:00 |
|
|
|
902b0b5e47
|
feat: 条件节点添加包含和不包含操作符
|
2026-02-14 16:52:56 +08:00 |
|
|
|
9392da82b2
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotWebSocketDataRuleAction.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.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-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/dto/IotDeviceAuthReqDTO.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
|
2026-01-29 22:17:13 +08:00 |
|
|
|
8da6ca04a8
|
feat(BPM): AsyncTaskExecutor 如果不创建，会导致项目启动时，Flowable 报错的问题
|
2026-01-27 18:55:12 +08:00 |
|
|
|
b29c5f0e40
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2026-01-25 21:06:53 +08:00 |
|
|
|
0c0a6ae40a
|
feat：【bpm】删除AsyncListenableTaskExecutor配置
|
2026-01-25 20:51:26 +08:00 |
|
|
|
52f067cdfb
|
fix: 屏蔽解析器覆写, 避免解析 ${coll_userList} 变量报错
|
2026-01-20 23:58:06 +08:00 |
|
|
|
a39647efc0
|
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/IotSceneRuleServiceImpl.java
|
2026-01-18 18:27:48 +08:00 |
|
|
|
853afd2184
|
!1501 IOT：同步最新代码
Merge pull request !1501 from 芋道源码/feature/iot
|
2026-01-18 10:26:57 +00:00 |
|
|
|
f3ef0e72e2
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
|
2026-01-18 18:15:27 +08:00 |
|
|
|
dfd1f90ae0
|
fix：【bpm】getTaskTodoPage 未基于租户过滤的问题
|
2026-01-09 19:38:32 +08:00 |
|
|
|
6816821e13
|
refactor(bpm): 优化并行和串行多实例行为实现
- 移除多余的集合变量设置逻辑，简化任务处理人获取流程
- 添加对集合表达式、集合变量和元素变量的解析器覆写屏蔽
- 修复串行多实例中使用 getVariableLocal 替代 getVariable 避免变量清理问题
- 统一代码注释和实现逻辑，提高代码可读性
|
2026-01-06 17:35:05 +08:00 |
|
|
|
752ed579c0
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-12-27 10:21:42 +08:00 |
|
|
|
d860ca2c8c
|
fix：【bpm】“refactor(bpm): 优化多实例行为初始化逻辑”导致的问题，对应 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1483/files
|
2025-12-26 21:23:47 +08:00 |
|
|
|
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 |
|
|
|
6d1c1f2095
|
fix：【bpm】流程抄送时，可能缺少租户上下文的问题，对应 https://gitee.com/zhijiantianya/yudao-cloud/issues/IDEUQ6
|
2025-12-25 21:46:05 +08:00 |
|
|
|
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 |
|
|
|
efaa577556
|
fix：【bpm】getTaskManagerPage 接口的操作权限标识拼写错误
|
2025-12-25 09:14:59 +08:00 |
|
|
|
cae80cae31
|
refactor(bpm): 优化多实例行为初始化逻辑
- 将 collectionVariable 和 collectionElementVariable 的初始化移到构造函数中
- 避免在运行期修改 Behavior 实例状态
- 删除重复的变量设置代码
- 保留必要的注释说明字段用途
- 确保表达式和变量互斥关系正确处理
|
2025-12-22 14:45:52 +08:00 |
|
|
|
3143326b18
|
fix：【bpm】calculateUsersByActivity 忽略数据权限，避免过滤导致找不到候选人，对应 https://t.zsxq.com/8IG6p
|
2025-12-20 10:36:59 +08:00 |
|
|
|
91870831d2
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-12-07 10:38:30 +08:00 |
|
|
|
cdc4255da1
|
fix：【bpm】更改 moveActivityIdsToSingleActivityId 传入的第一个参数，对应 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1466/
|
2025-11-29 18:56:42 +08:00 |
|
|
|
aee514cf33
|
fix(bpm): 更改 moveActivityIdsToSingleActivityId 传入的第一个参数
|
2025-11-28 11:58:08 +08:00 |
|
|
|
755d5e48cc
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-11-26 18:49:11 +08:00 |
|
|
|
bdb4e3fadc
|
fix：【bpm】flowable 7.2.0 驳回可使用 moveActivityIdsToSingleActivityId 方法
|
2025-11-25 08:55:59 +08:00 |
|
|
|
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 |
|
|
|
9fe1ce8e1a
|
chore：flowable from 7.0.1 to 7.2.0
|
2025-11-23 17:36:28 +08:00 |
|
|
|
c34c218bb5
|
fix：【bpm】只能退回到已经处理过的节点（排除审批未经过的节点）。相关 issue：https://github.com/YunaiV/ruoyi-vue-pro/issues/982
|
2025-11-23 12:04:42 +08:00 |
|
|
|
fe186da113
|
fix：【bpm】流程操作时，增加数据权限的忽略
|
2025-11-23 10:11:38 +08:00 |
|
|
|
d34dd35eab
|
fix：【bpm】流程操作时，增加数据权限的忽略
|
2025-11-23 10:11:34 +08:00 |
|
|
|
d592080f3f
|
fix：【bpm工作流】BpmProcessInstanceCopyServiceImpl抄送时参数顺序错误的问题#273
|
2025-11-21 20:32:37 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
dace9cfed5
|
perf: [BPM 工作流] 驳回预测 review 修改
|
2025-10-12 16:28:49 +08:00 |
|
|
|
27235016ad
|
perf: [BPM 工作流] 驳回预测 review 修改
|
2025-10-12 16:20:37 +08:00 |
|
|
|
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 |
|
