From 2aa076ef25d992fbed695e6477a9ffea2708e060 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 3 Jan 2023 09:19:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=88=90=E6=9C=AC=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tbs/controller/TbsActivityController.java | 29 ++++++++++--------- .../entity/vo/TbsActivityDefaultCenterVo.java | 5 +--- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index b7722ecc..e1ab8fd7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -378,26 +378,27 @@ public class TbsActivityController { } } - List costCenters = new ArrayList<>(); List saleRegions = new ArrayList<>(); - List bizRegions = new ArrayList<>(); for (TbsBudget budget : centerBudgetList) { - if(budget.getCenterType().equals(TbsCenterType.center.name())){ - BmsCostCenter costCenter = bmsCostCenterService.getById(budget.getCenterId()); - costCenters.add(costCenter); - }else if (budget.getCenterType().equals(TbsCenterType.bizRegion.name())){ - BmsRegion2 region2 = bmsRegion2Service.getById(budget.getCenterId()); - bizRegions.add(region2); - }else if (budget.getCenterType().equals(TbsCenterType.saleRegion.name())){ + if (budget.getCenterType().equals(TbsCenterType.saleRegion.name())){ BmsRegion region = bmsRegionService.getById(budget.getCenterId()); - saleRegions.add(region); + if(region!=null){ + saleRegions.add(region); + } } } TbsActivityDefaultCenterVo defaultCenterVo = new TbsActivityDefaultCenterVo(); - defaultCenterVo.setSupplier(supplier); - defaultCenterVo.setCostCenters(costCenters); - defaultCenterVo.setSaleRegions(saleRegions); - defaultCenterVo.setBizRegions(bizRegions); + if(CollectionUtil.isNotEmpty(saleRegions)){ + BmsRegion saleRegionTemp = saleRegions.get(0); + for (BmsRegion saleRegion : saleRegions) { + if(saleRegionTemp.getLevel() costCenters; + private BmsRegion saleRegion; - private List saleRegions; - - private List bizRegions; }