public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-16 20:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Jpa适配 模板问题修复 (#16926)

Browse Source
This commit is contained in:
王嘉豪
2025-09-09 14:13:40 +08:00
committed by GitHub
parent 1db79ec88a
commit 721ecc0bff
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java
View File

@@ -1,5 +1,6 @@
package io.dataease.template.manage;
import com.querydsl.core.types.Expression;
import com.querydsl.core.types.Projections;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.jpa.impl.JPAQuery;
@@ -373,8 +374,7 @@ public class TemplateCenterManage {
QVisualizationTemplate vt = QVisualizationTemplate.visualizationTemplate;
QVisualizationTemplateCategoryMap vtcm = QVisualizationTemplateCategoryMap.visualizationTemplateCategoryMap;
JPAQuery<TemplateManageDTO> query = queryFactory.select(Projections.fields(
TemplateManageDTO.class,
List<Expression<?>> fields = Arrays.asList(
vt.id,
vt.name,
vt.pid,
@@ -384,16 +384,25 @@ public class TemplateCenterManage {
vt.createBy,
vt.createTime,
vt.templateType,
vt.snapshot,
request.getWithBlobs().equals("Y") ? vt.templateStyle : Expressions.nullExpression(),
request.getWithBlobs().equals("Y") ? vt.templateData : Expressions.nullExpression(),
request.getWithBlobs().equals("Y") ? vt.dynamicData : Expressions.nullExpression()
))
vt.snapshot
);
// 根据条件添加字段
List<Expression<?>> allFields = new ArrayList<>(fields);
if ("Y".equals(request.getWithBlobs())) {
allFields.add(vt.templateStyle);
allFields.add(vt.templateData);
allFields.add(vt.dynamicData);
}
JPAQuery<TemplateManageDTO> query = queryFactory.select(Projections.fields(
TemplateManageDTO.class,
allFields.toArray(new Expression[0])
))
.from(vt)
.leftJoin(vtcm).on(vt.id.eq(vtcm.templateId))
.where(vtcm.categoryId.eq(request.getCategoryId()))
.orderBy(vt.createTime.desc());
return query.fetch();
return query.fetch();
}
}