修复模板显示状态异常

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

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