From a305a3022625b8a06caadbe10e338e40e6c98ff8 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 5 Feb 2026 19:18:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hxhq/business/service/impl/TemplateServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java index 85764cd..61dcca7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.Step; +import com.hxhq.business.enums.study.StudyTypeEnum; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -49,8 +50,10 @@ public class TemplateServiceImpl extends ServiceImpl i if(template.getStatus()!=null && template.getStatus().intValue()>0){ queryWrapper.eq("t.status",template.getStatus()); } - if(template.getStudyType()!=null){ + if(template.getStudyType()!=null&& template.getStudyType().intValue()>0){ queryWrapper.eq("t.study_type",template.getStudyType()); + }else{ + queryWrapper.in("t.study_type", StudyTypeEnum.fsy.getValue(), StudyTypeEnum.sy.getValue()); } queryWrapper.orderByAsc("t.sn"); return baseMapper.queryList(queryWrapper);