Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

报表模块mycat环境无法路由修复

Browse Source
This commit is contained in:
gaoqr
2026-05-15 11:21:09 +08:00
parent 9b1a85afb5
commit 3cc76015a8
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportTemplateMapper.java
+20 -6
View File
@@ -12,6 +12,8 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.CF_ORGANID;
/** /**
* 报表模板信息 Mapper * 报表模板信息 Mapper
* *
@@ -32,10 +34,16 @@ public interface ReportTemplateMapper extends BaseMapperX<ReportTemplateDO> {
default ReportTemplateDO selectNormalTemplateById(Long id, Long organId) { default ReportTemplateDO selectNormalTemplateById(Long id, Long organId) {
LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<ReportTemplateDO>() LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<ReportTemplateDO>()
.eq(ReportTemplateDO::getId, id) .eq(ReportTemplateDO::getId, id)
.and(wr -> wr.or(wrapper -> wrapper .and(wr -> wr
.or(wrapper -> wrapper
.eq(ReportTemplateDO::getOrganId, organId) .eq(ReportTemplateDO::getOrganId, organId)
.eq(ReportTemplateDO::getType, ReportTemplateTypeEnum.CUSTOM)) .eq(ReportTemplateDO::getType, ReportTemplateTypeEnum.CUSTOM)
.or(wrapper -> wrapper.eq(ReportTemplateDO::getType, ReportTemplateTypeEnum.SYSTEM))); )
.or(wrapper -> wrapper
.eq(ReportTemplateDO::getOrganId, CF_ORGANID)
.eq(ReportTemplateDO::getType, ReportTemplateTypeEnum.SYSTEM)
)
);
return selectOne(queryWrapper); return selectOne(queryWrapper);
} }
@@ -52,10 +60,16 @@ public interface ReportTemplateMapper extends BaseMapperX<ReportTemplateDO> {
LambdaQueryWrapper<ReportTemplateDO> queryWrapper = new LambdaQueryWrapperX<ReportTemplateDO>() LambdaQueryWrapper<ReportTemplateDO> queryWrapper = new LambdaQueryWrapperX<ReportTemplateDO>()
.likeIfPresent(ReportTemplateDO::getName, name) .likeIfPresent(ReportTemplateDO::getName, name)
.orderByDesc(ReportTemplateDO::getCreateTime) .orderByDesc(ReportTemplateDO::getCreateTime)
.and(wr -> wr.or(wrapper -> wrapper .and(wr -> wr
.or(wrapper -> wrapper
.eq(ReportTemplateDO::getOrganId, organId) .eq(ReportTemplateDO::getOrganId, organId)
.eq(ReportTemplateDO::getType, ReportTemplateTypeEnum.CUSTOM)) .eq(ReportTemplateDO::getType, ReportTemplateTypeEnum.CUSTOM)
.or(wrapper -> wrapper.eq(ReportTemplateDO::getType, ReportTemplateTypeEnum.SYSTEM))) )
.or(wrapper -> wrapper
.eq(ReportTemplateDO::getOrganId, CF_ORGANID)
.eq(ReportTemplateDO::getType, ReportTemplateTypeEnum.SYSTEM)
)
)
// 不返回content xml，点击具体的模板中返回xml // 不返回content xml，点击具体的模板中返回xml
.select(ReportTemplateDO::getId, ReportTemplateDO::getName, ReportTemplateDO::getCreateTime, ReportTemplateDO::getRemark, ReportTemplateDO::getType); .select(ReportTemplateDO::getId, ReportTemplateDO::getName, ReportTemplateDO::getCreateTime, ReportTemplateDO::getRemark, ReportTemplateDO::getType);
return selectList(queryWrapper); return selectList(queryWrapper);
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/datasource/ReportDatasourceServiceImpl.java
+5 -1
View File
@@ -53,6 +53,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.CF_ORGANID;
import static com.cf.imes.module.report.enums.ErrorCodeConstants.DATASET_GET_FIELDS_ERROR; import static com.cf.imes.module.report.enums.ErrorCodeConstants.DATASET_GET_FIELDS_ERROR;
import static com.cf.imes.module.report.enums.ErrorCodeConstants.DATASET_SQL_INJECTION_RISK; import static com.cf.imes.module.report.enums.ErrorCodeConstants.DATASET_SQL_INJECTION_RISK;
import static com.cf.imes.module.report.enums.ErrorCodeConstants.DATASET_SQL_REQUIRED; import static com.cf.imes.module.report.enums.ErrorCodeConstants.DATASET_SQL_REQUIRED;
@@ -155,7 +156,10 @@ public class ReportDatasourceServiceImpl implements ReportDatasourceService {
queryWrapper.or(wrapper -> wrapper queryWrapper.or(wrapper -> wrapper
.eq(ReportDatasourceDO::getOrganId, finalCurrentOrganId) .eq(ReportDatasourceDO::getOrganId, finalCurrentOrganId)
.eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.CUSTOM)) .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)
);
List<ReportDatasourceDO> reportDatasourceDOS = datasourceMapper.selectList(queryWrapper); List<ReportDatasourceDO> reportDatasourceDOS = datasourceMapper.selectList(queryWrapper);
// 查询数据集 // 查询数据集