This commit is contained in:
2026-01-06 17:08:25 +08:00
parent 0cf31591ea
commit 0536723801
4 changed files with 50 additions and 41 deletions

View File

@@ -63,8 +63,8 @@ public class ReportTemplateDto {
@Schema(description = "创建时间范围")
private String[] createTimeArr;
@Schema(description = "是否为个人模板")
private boolean personal;
@Schema(description = "是否为个人模板 1:查询公共模版 2查询个人")
public int type;
@Schema(description = "报告审批模板名称")
public String approveTemplateName;

View File

@@ -175,7 +175,7 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
if (ObjectUtils.isNotEmpty(req.getTemplateStatus())) {
queryWrapper.eq(SimulationReportTemplate::getTemplateStatus, req.getTemplateStatus());
}
if (req.isPersonal()) {
if (req.getType() == 2) {
queryWrapper.eq(SimulationReportTemplate::getCreator, ThreadLocalContext.getUserId());
if (ObjectUtils.isNotEmpty(req.getApproveType())) {
queryWrapper.eq(SimulationReportTemplate::getApproveType, req.getApproveType());