From 3c63ccce3357fb0ed48ee3a0170e8ce3ffef0232 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 16 Nov 2023 14:38:01 +0800 Subject: [PATCH] debug --- .../controller/TbsActivityTemplateController.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 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 9d117c2d..387d2be5 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 @@ -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 templateRegions = tbsActivityTemplateRegionService.list(tempLqw); - List templateIds = templateRegions.stream() - .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList()); + + List templateRegions = null; + if(CollectionUtil.isNotEmpty(saleRegion)||CollectionUtil.isNotEmpty(bizRegion)){ + templateRegions = tbsActivityTemplateRegionService.list(tempLqw); + } + List templateIds = templateRegions!=null&&templateRegions.size()>0?templateRegions.stream() + .map(TbsActivityTemplateRegion::getTemplateId).distinct().collect(Collectors.toList()):new ArrayList<>(); + templateIds.add(0L); LambdaQueryWrapper tmpLqw = new LambdaQueryWrapper<>(); tmpLqw.eq(TbsActivityTemplate::getTemplateState,1); + List 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->{