diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java index 2d2499a0..bf319c7b 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java @@ -230,28 +230,27 @@ public class TbsActivityTemplateController { }); } List templateRegions = tbsActivityTemplateRegionService.list(tempLqw); - if(CollectionUtil.isNotEmpty(templateRegions)){ - List templateIds = templateRegions.stream() - .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList()); - LambdaQueryWrapper tmpLqw = new LambdaQueryWrapper<>(); - tmpLqw.and(a->{ - if(CollectionUtil.isNotEmpty(saleRegion)){ - a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0)); - } - if(CollectionUtil.isNotEmpty(bizRegion)){ - a.or(b->b.eq(TbsActivityTemplate::getBizRegionFlag,0)); - } + List templateIds = templateRegions.stream() + .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList()); + LambdaQueryWrapper tmpLqw = new LambdaQueryWrapper<>(); + tmpLqw.eq(TbsActivityTemplate::getTemplateState,1); + tmpLqw.and(a->{ + if(CollectionUtil.isNotEmpty(saleRegion)){ + a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0)); + } + if(CollectionUtil.isNotEmpty(bizRegion)){ + a.or(b->b.eq(TbsActivityTemplate::getBizRegionFlag,0)); + } + if(CollectionUtil.isNotEmpty(templateRegions)){ a.or(b->b.in(TbsActivityTemplate::getId,templateIds)); - }); - if(StringUtils.hasText(templateName)){ - tmpLqw.like(TbsActivityTemplate::getTemplateName,templateName); } - PageUtil.startPage(); - List templates = tbsActivityTemplateService.list(tmpLqw); - return R.byPageHelperList(templates); - }else { - return R.byEmptyList(); + }); + if(StringUtils.hasText(templateName)){ + tmpLqw.like(TbsActivityTemplate::getTemplateName,templateName); } + PageUtil.startPage(); + List templates = tbsActivityTemplateService.list(tmpLqw); + return R.byPageHelperList(templates); } }