修复模板显示状态异常

src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java

@@ -230,10 +230,10 @@ public class TbsActivityTemplateController {
             });
         }
         List<TbsActivityTemplateRegion> templateRegions = tbsActivityTemplateRegionService.list(tempLqw);
-        if(CollectionUtil.isNotEmpty(templateRegions)){
         List<Long> templateIds = templateRegions.stream()
                 .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList());
         LambdaQueryWrapper<TbsActivityTemplate> tmpLqw = new LambdaQueryWrapper<>();
+        tmpLqw.eq(TbsActivityTemplate::getTemplateState,1);
         tmpLqw.and(a->{
             if(CollectionUtil.isNotEmpty(saleRegion)){
                 a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0));
@@ -241,7 +241,9 @@ public class TbsActivityTemplateController {
             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);
@@ -249,9 +251,6 @@ public class TbsActivityTemplateController {
         PageUtil.startPage();
         List<TbsActivityTemplate> templates = tbsActivityTemplateService.list(tmpLqw);
         return R.byPageHelperList(templates);
-        }else {
-            return R.byEmptyList();
-        }
     }
 
 }