debug

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

@@ -25,6 +25,7 @@ import com.qs.serve.modules.tbs.entity.TbsActivityTemplate;
 import com.qs.serve.modules.tbs.service.TbsActivityTemplateService;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -248,11 +249,17 @@ public class TbsActivityTemplateController {
                 con.in(TbsActivityTemplateRegion::getRegionId,regionIds);
             });
         }
-        List<TbsActivityTemplateRegion> templateRegions = tbsActivityTemplateRegionService.list(tempLqw);
-        List<Long> templateIds = templateRegions.stream()
-                .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList());
+
+        List<TbsActivityTemplateRegion> templateRegions = null;
+        if(CollectionUtil.isNotEmpty(saleRegion)||CollectionUtil.isNotEmpty(bizRegion)){
+            templateRegions = tbsActivityTemplateRegionService.list(tempLqw);
+        }
+        List<Long> templateIds = templateRegions!=null&&templateRegions.size()>0?templateRegions.stream()
+                .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList()):new ArrayList<>();
+        templateIds.add(0L);
         LambdaQueryWrapper<TbsActivityTemplate> tmpLqw = new LambdaQueryWrapper<>();
         tmpLqw.eq(TbsActivityTemplate::getTemplateState,1);
+        List<TbsActivityTemplateRegion> finalTemplateRegions = templateRegions;
         tmpLqw.and(a->{
             if(CollectionUtil.isNotEmpty(saleRegion)){
                 a.or(b->b.eq(TbsActivityTemplate::getSaleRegionFlag,0));
@@ -260,7 +267,7 @@ public class TbsActivityTemplateController {
             if(CollectionUtil.isNotEmpty(bizRegion)){
                 a.or(b->b.eq(TbsActivityTemplate::getBizRegionFlag,0));
             }
-            if(CollectionUtil.isNotEmpty(templateRegions)){
+            if(CollectionUtil.isNotEmpty(finalTemplateRegions)){
                 a.or(b->b.in(TbsActivityTemplate::getId,templateIds));
             }
             a.or(b->{