From 31bd2c17088ec34072deabe106ff1d695c8b2b49 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 11 十一月 2024 11:11:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmModelServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmModelServiceImpl.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmModelServiceImpl.java
index 5fc0e1a..d611acd 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmModelServiceImpl.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/service/definition/BpmModelServiceImpl.java
@@ -77,8 +77,11 @@
if (count == 0) {
return PageResult.empty(count);
}
+ // 关闭多租户查询，不添加tenantId条件
+ if (StrUtil.isNotBlank(FlowableUtils.getTenantId())) {
+ modelQuery.modelTenantId(FlowableUtils.getTenantId());
+ }
List<Model> models = modelQuery
- .modelTenantId(FlowableUtils.getTenantId())
.orderByCreateTime().desc()
.listPage(PageUtils.getStart(pageVO), pageVO.getPageSize());
return new PageResult<>(models, count);
--
Gitblit v1.9.3