|
|
199467a70d
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-08-05 19:36:21 +08:00 |
|
|
|
8108b9b826
|
fix：【bpm 工作流】BpmSequentialMultiInstanceBehavior 兼容 CallActivity、SubProcess 场景
|
2025-08-04 12:52:07 +08:00 |
|
|
|
d3888d7b4a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-08-03 19:46:21 +08:00 |
|
|
|
192bbf6e92
|
fix：【bpm 工作流】BpmSequentialMultiInstanceBehavior 兼容 CallActivity、SubProcess 场景
|
2025-08-03 19:16:37 +08:00 |
|
|
|
2653b614d1
|
feat：【bpm 工作流】审批人自选时，相同节点共享数据
|
2025-08-02 22:08:39 +08:00 |
|
|
|
4fbdd3dc5c
|
feat：【bpm 工作流】兼容 bpmn 场景下，使用 START_USER_NODE_ID 的预测
|
2025-08-02 20:56:25 +08:00 |
|
|
|
6341e869a1
|
【同步】jdk21 和 jdk8 的代码
|
2025-07-31 22:58:35 +08:00 |
|
|
|
83537fd2d9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/service/category/BpmCategoryServiceImplTest.java
|
2025-07-31 13:50:09 +08:00 |
|
|
|
aefaff2cad
|
fix：【bpm 工作流】BpmCategoryServiceImplTest 单测不正确的问题
|
2025-07-31 09:56:34 +08:00 |
|
|
|
c4df87f7ee
|
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/core/handler/GlobalExceptionHandler.java
|
2025-07-30 19:07:46 +08:00 |
|
|
|
f71ec38456
|
【同步】BOOT 和 CLOUD 的功能
|
2025-07-30 19:06:44 +08:00 |
|
|
|
ff70aaa6a9
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-07-30 18:59:32 +08:00 |
|
|
|
ab7d9fdf72
|
fix：【bpm 工作流】委派、转办时，owner 不重复设置
|
2025-07-29 20:08:27 +08:00 |
|
|
|
e07fb6c8fe
|
review：【bpm 工作流】usertask 的跳过表达式
|
2025-07-29 13:13:47 +08:00 |
|
|
|
1e271f5270
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-07-29 09:38:22 +08:00 |
|
|
|
1684706e9a
|
feat: [BPM 工作流] 增加跳过表达式判断。
|
2025-07-29 09:36:53 +08:00 |
|
|
|
b208f100a6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java
|
2025-07-26 17:25:10 +08:00 |
|
|
|
b8889a94c7
|
!1362 feat: 使用 fastExcel 替换 easyExcel (<a href="https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Ffast-excel%2Ffastexcel">https://github.com/fast-excel/fastexcel</a>)
Merge pull request !1362 from xingyu/master-jdk17-excel
|
2025-07-26 09:20:20 +00:00 |
|
|
|
b535716084
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/api/websocket/WebSocketSenderApiImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/websocket/DemoWebSocketMessageListener.java
|
2025-07-26 09:49:46 +08:00 |
|
|
|
4347f13362
|
review：【BPM 工作流】并行分支使用包容网关实现 =》补充一些注释说明
|
2025-07-25 20:18:33 +08:00 |
|
|
|
76d8906748
|
fix: [BPM 工作流] 获取下个审批任务节点问题修复。
|
2025-07-24 23:07:15 +08:00 |
|
|
|
97cec2897b
|
feat: [BPM 工作流] 并行分支使用包容网关实现
|
2025-07-24 22:23:15 +08:00 |
|
|
|
a4244ab999
|
fix：【BPM 工作流】存在加签时，退回报 Execution could not be found with id null
|
2025-07-23 12:46:00 +08:00 |
|
|
|
376114a874
|
fix：【BPM 工作流】修复子流程发起人为列表时实际发起人会变成主流程发起人 https://gitee.com/zhijiantianya/yudao-cloud/issues/ICNHA8
|
2025-07-22 23:59:20 +08:00 |
|
|
|
989c4e4b88
|
fix：【BPM 工作流】bpmn subProcess 存在 userTask NPE 的问题
|
2025-07-22 21:57:01 +08:00 |
|
|
|
b766f8d820
|
fix：【BPM 工作流】子流程支持流程 title 自定义标题
|
2025-07-22 20:15:52 +08:00 |
|
|
|
7ba084bc4d
|
fix：【BPM 工作流】子流程返回的 processInstanceId 不正确的问题
|
2025-07-22 12:26:08 +08:00 |
|
|
|
3aac40a51e
|
fix：【BPM 工作流】流程模型分类删除时，额外校验是否被流程模型所使用。
|
2025-07-21 16:17:17 +08:00 |
|
|
|
d36c0dce7c
|
fix：【BPM 工作流】BPMN 场景下，多次提醒可能丢失 elementId 的问题
|
2025-07-20 23:43:46 +08:00 |
|
|
|
51859afa9a
|
fix：【BPM 工作流】SIMPLE 延迟任务时，租户上下文丢失的问题
|
2025-07-20 20:26:23 +08:00 |
|
|
|
14d8c2bb40
|
fix：【BPM 工作流】buildConditionExpression 在流程预测时，因为变量不存在，导致 Unknow property 异常的问题
|
2025-07-20 20:02:48 +08:00 |
|
|
|
c645813725
|
fix：【BPM 工作流】待办任务、已办任务，使用时间范围查询时，会拼接 OR 的情况（非完美修复方案）。
|
2025-07-20 17:47:50 +08:00 |
|
|
|
dc7763ef0b
|
fix：【BPM 工作流】BpmTaskCandidateExpressionStrategy 在 PropertyNotFoundException 不存在时，频繁打 warn 日志
|
2025-07-20 16:45:16 +08:00 |
|
|
|
bfcc1987cb
|
fix: 【BPM 工作流】避免在 BpmHttpRequestUtils 中重复添加 processInstanceId 参数
|
2025-07-20 11:07:48 +08:00 |
|
|
|
f38485ffd5
|
Merge branch 'refs/heads/master-jdk17' into master-jdk17-excel
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java
|
2025-06-15 18:54:13 +08:00 |
|
|
|
a7a30e6a28
|
!1352 fix(bpm): 修复存在未拼接基础信息时直接返回的问题
Merge pull request !1352 from hclnb/master
|
2025-06-15 02:48:30 +00:00 |
|
|
|
4b8048ff59
|
!1352 fix(bpm): 修复存在未拼接基础信息时直接返回的问题
|
2025-06-15 10:47:58 +08:00 |
|
|
|
7d867909d7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# sql/oracle/ruoyi-vue-pro.sql
# sql/sqlserver/ruoyi-vue-pro.sql
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
|
2025-06-15 10:21:55 +08:00 |
|
|
|
9dec02d02e
|
feat: 使用 fastExcel 替换 easyExcel (https://github.com/fast-excel/fastexcel)
|
2025-06-10 14:51:41 +08:00 |
|
|
|
5caf990920
|
fix: selectBatchIds 已过期
|
2025-05-26 14:06:02 +08:00 |
|
|
|
93982451eb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigSaveReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerSaveReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobRespVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobSaveReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/vo/AppFileUploadReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigService.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigService.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactService.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo02/Demo02CategoryService.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo02/Demo02CategoryServiceImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpService.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpServiceImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobService.java
|
2025-05-23 09:04:07 +08:00 |
|
|
|
3ca4cd874b
|
fix(bpm): 修复存在未拼接基础信息时直接返回的问题
|
2025-05-21 09:02:02 +08:00 |
|
|
|
86058b0d3b
|
fix：【BPM 工作流】当流程ID配置没有中缀的时候不设置过期时间
|
2025-05-20 20:36:47 +08:00 |
|
|
|
479dfb6c23
|
【同步】jdk21 和 jdk8 的代码
|
2025-05-19 20:12:12 +08:00 |
|
|
|
e00bfd02a1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsPerformanceController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/performance/CrmStatisticsPerformanceReqVO.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-mall/yudao-module-promotion/pom.xml
# yudao-module-mall/yudao-module-trade/pom.xml
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2025-05-17 14:14:23 +08:00 |
|
|
|
13da7eba6f
|
reactor：移除 bpm 的 api 包
|
2025-05-16 09:26:15 +08:00 |
|
|
|
b758e690c1
|
reactor：移除 system 和 infra 的 api 包
|
2025-05-15 00:08:11 +08:00 |
|
|
|
f3b897ea5d
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-05-13 19:30:11 +08:00 |
|
|
|
2cb4c7ddb4
|
fix：修复工作流的发起时间未返回
|
2025-05-13 19:23:09 +08:00 |
|
|
|
1cf079fec3
|
fix：【BPM 工作流】项目重启后，审批重启前的流程会出现生成的下一待办任务所属人出现缺失
|
2025-05-12 20:56:31 +08:00 |
|
