Commit Graph

8619 Commits

Author SHA1 Message Date
YunaiV 6f88f8596c V2.4.1 发布~ 2025-02-09 12:34:31 +08:00
YunaiV e17a282bd0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-02-09 12:34:01 +08:00
YunaiV 542beaf47b Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 2025-02-09 12:33:30 +08:00
YunaiV 2d18f593ae V2.4.1 发布~ 2025-02-09 12:33:24 +08:00
YunaiV 17d0d5bb0a Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2025-02-09 11:41:35 +08:00
YunaiV c97fafebbe Merge remote-tracking branch 'origin/master'
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
2025-02-09 11:41:05 +08:00
YunaiV f7c56ad4eb 【同步】jdk21 和 jdk8 的代码 2025-02-09 11:40:53 +08:00
YunaiV a44a45a2cb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmHttpRequestTrigger.java
2025-02-09 11:36:21 +08:00
YunaiV cf7ff1ca8a 【功能修复】CRM:CrmBusinessController 部分权限标识不正确的问题 2025-02-09 08:11:52 +08:00
YunaiV d75d71d7d0 1218 如果没查到用户也有可能是空结果集,不一定是null 2025-02-09 07:26:30 +08:00
芋道源码 4c9777c8d4
!1218 如果没查到用户也有可能是空结果集,不一定是null 。
Merge pull request !1218 from 爱上猫的小鱼儿/master
2025-02-08 23:21:23 +00:00
芋道源码 d7c01b7e50
Merge pull request #731 from xiefangzhenz/bugfix/filter-logic-fix
添加项目前缀,日志无法插入
2025-02-09 07:16:09 +08:00
YunaiV 949fa22509 添加项目前缀,日志无法插入 #731 2025-02-09 07:15:59 +08:00
YunaiV 19b5582a78 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-02-09 07:14:42 +08:00
YunaiV 4e9583fae4 Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-02-09 07:14:23 +08:00
芋道源码 b00d22a907
Merge pull request #747 from mcwindy/master-jdk17
fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId
2025-02-09 07:13:44 +08:00
YunaiV 129e9868fb 【代码评审】BPM:ID 编码器 2025-02-09 07:04:06 +08:00
芋道源码 3cbe59ace3
!1217 fix: 无时间中缀不设置Redis过期时间
Merge pull request !1217 from Lesan/feature/bpm-new
2025-02-08 22:58:03 +00:00
YunaiV 9569c3fbed 【代码评审】BPM:触发器 - 表单修改 2025-02-09 06:55:56 +08:00
jason f5050807e1 【功能优化】 优化更新流程表单数据触发器 2025-02-07 22:45:03 +08:00
jason a23b0480f1 【功能新增】 新增修改流程表单数据触发器 2025-02-06 14:14:14 +08:00
mcwindy 4e43958fe3 fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId 2025-02-05 11:42:59 +08:00
爱上猫的小鱼儿 ad94d16a75
如果没查到用户也有可能是空结果集,不一定是null 。
Signed-off-by: 爱上猫的小鱼儿 <125358+jlynet_cn@user.noreply.gitee.com>
2025-01-28 17:57:32 +00:00
LesanOuO b4f93e832f fix: 无时间中缀不设置Redis过期时间 2025-01-27 09:25:57 +08:00
jason 362b872aa8 Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm 2025-01-26 15:36:48 +08:00
jason 44486afd95 【代码评审修复】 Http 触发器返回值处理修改 2025-01-26 15:36:14 +08:00
YunaiV f47f6d934e 【代码评审】Bpm:数据报表 2025-01-26 13:53:02 +08:00
YunaiV f8d6f1e2c4 【代码评审】Bpm:触发器的实现 2025-01-26 13:52:01 +08:00
jason 0723e4571d Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm 2025-01-26 13:00:54 +08:00
jason 53789d9b80 【功能新增】 解析 Http 请求触发器返回值,修改流程变量 2025-01-26 13:00:20 +08:00
芋道源码 805e570406
!1216 feat: BPM-数据报表
Merge pull request !1216 from Lesan/feature/bpm-报表
2025-01-26 04:59:55 +00:00
LesanOuO 86f568280a feat: BPM-数据报表 2025-01-26 11:06:29 +08:00
YunaiV 8f16786471 【功能修复】Bpm:获取流程列表的时候,过滤租户 2025-01-25 17:52:50 +08:00
芋道源码 b8e56a6bde
!1214 雪花ID溢出了 update apierrorlog/ApiErrorLogRespVO.java.
Merge pull request !1214 from 山野羡民/N/A
2025-01-25 09:17:14 +00:00
YunaiV 86dc3763fc 【代码评审】Bpm:数据报表 2025-01-25 17:16:57 +08:00
芋道源码 623a41d48c
!1215 feat: BPM-报表
Merge pull request !1215 from Lesan/feature/bpm-报表
2025-01-25 09:08:45 +00:00
芋道源码 1ae51bde20
!1213 代码审查修改
Merge pull request !1213 from Lesan/feature/bpm-代码审查
2025-01-25 09:04:13 +00:00
LesanOuO 3342ae1be8 feat: BPM-报表 2025-01-25 13:27:37 +08:00
山野羡民 69efe91bde
雪花ID溢出了 update apierrorlog/ApiErrorLogRespVO.java.
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
2025-01-25 02:47:03 +00:00
LesanOuO f409a67d2f feat: 抄送添加摘要 2025-01-25 10:41:27 +08:00
LesanOuO 0ef8467546 feat: 摘要设置代码评审修改 2025-01-25 10:26:41 +08:00
LesanOuO f60a4dfa6b feat: 添加Task取消理由 2025-01-25 10:24:34 +08:00
YunaiV 38c24bddb6 【同步】jdk21 和 jdk8 的代码 2025-01-25 10:13:41 +08:00
YunaiV 3682bcda3e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
2025-01-25 10:10:19 +08:00
YunaiV 06634a4265 【单测修复】system:AdminAuthServiceImplTest 2025-01-25 10:09:39 +08:00
YunaiV 599c432abb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessListenerServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
2025-01-25 09:49:57 +08:00
YunaiV 534c64709f 【代码评审】Bpm:触发器的实现 2025-01-25 09:49:25 +08:00
YunaiV d63e315876 【代码优化】Bpm:调整 IntArrayValuable 到 ArrayValuable 2025-01-24 22:55:21 +08:00
YunaiV bb798681f7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModeConditionTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskRejectHandlerTypeEnum.java
2025-01-24 22:48:37 +08:00
YunaiV aab61f7963 【代码评审】Bpm:更多设置-摘要设置 2025-01-24 21:03:55 +08:00