From dd134616bdb757dd0540ad0d5536e28f7e129194 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 15 May 2026 17:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=A8=A1=E5=9D=97mycat?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=97=A0=E6=B3=95=E8=B7=AF=E7=94=B1=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/datasource/ReportDatasourceMapper.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/datasource/ReportDatasourceMapper.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/datasource/ReportDatasourceMapper.java index 11f37945a..9009d23e8 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/datasource/ReportDatasourceMapper.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/datasource/ReportDatasourceMapper.java @@ -10,6 +10,8 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; import java.util.Set; +import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.CF_ORGANID; + /** * 报表数据源 Mapper * @@ -30,10 +32,14 @@ public interface ReportDatasourceMapper extends BaseMapperX default ReportDatasourceDO selectNormalDatasourceById(Long id, Long organId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(ReportDatasourceDO::getId, id) - .and(wr -> wr.or(wrapper -> wrapper + .and(wr -> wr + .or(wrapper -> wrapper .eq(ReportDatasourceDO::getOrganId, organId) .eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.CUSTOM)) - .or(wrapper -> wrapper.eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.SYSTEM))); + .or(wrapper -> wrapper + .eq(ReportDatasourceDO::getOrganId, 1L) + .eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.SYSTEM)) + ); return selectOne(queryWrapper); } @@ -50,7 +56,9 @@ public interface ReportDatasourceMapper extends BaseMapperX .and(wr -> wr.or(wrapper -> wrapper .eq(ReportDatasourceDO::getOrganId, organId) .eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.CUSTOM)) - .or(wrapper -> wrapper.eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.SYSTEM))); + .or(wrapper -> wrapper + .eq(ReportDatasourceDO::getOrganId, CF_ORGANID) + .eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.SYSTEM))); return selectList(queryWrapper); } }