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; }