From c9d5cc856995e7bc5a50be7a7993b1aedca56910 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Sat, 28 Jan 2023 14:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=9D=BF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TbsActivityTemplateController.java        | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

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<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.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<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));
+            }
+            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<TbsActivityTemplate> templates = tbsActivityTemplateService.list(tmpLqw);
-            return R.byPageHelperList(templates);
-        }else {
-            return R.byEmptyList();
+        });
+        if(StringUtils.hasText(templateName)){
+            tmpLqw.like(TbsActivityTemplate::getTemplateName,templateName);
         }
+        PageUtil.startPage();
+        List<TbsActivityTemplate> templates = tbsActivityTemplateService.list(tmpLqw);
+        return R.byPageHelperList(templates);
     }
 
 }