diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
index c1b0b6be..426d5e47 100644
--- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
@@ -325,7 +325,9 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         }
 
         BigDecimal costSumAmt =  baseMapper.querySumAmt(costDTO);
-        percent = costSumAmt.divide(dispatchSumAmt,4, RoundingMode.HALF_UP).floatValue();
+        if(costSumAmt!=null) {
+            percent = costSumAmt.divide(dispatchSumAmt, 4, RoundingMode.HALF_UP).floatValue();
+        }
         return percent;
     }
 
diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java
index f26e0da8..a4bab340 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java
@@ -105,10 +105,12 @@ public class BmsRegionController {
             regionIds.addAll(supplier.listSaleRegionIds());
         }
         List<HisUserSupplier> hisUserSuppliers = hisUserSupplierService.selectHisSupplier(null,false);
-        List<String> firstRegionIds = hisUserSuppliers.stream().map(a->a.getSaleRegionFirst()).collect(Collectors.toList());
-        List<String> secondRegionIds = hisUserSuppliers.stream().map(a->a.getSaleRegionSecond()).collect(Collectors.toList());
-        List<String> thirdRegionIds = hisUserSuppliers.stream().map(a->a.getSaleRegionThird()).collect(Collectors.toList());
-        List<String> fourthlyRegionIds = hisUserSuppliers.stream().map(a->a.getSaleRegionFourthly()).collect(Collectors.toList());
+        List<Long> supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
+        List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
+        List<String> firstRegionIds = supplierList.stream().map(a->a.getRegionFirst()).collect(Collectors.toList());
+        List<String> secondRegionIds = supplierList.stream().map(a->a.getRegionSecond()).collect(Collectors.toList());
+        List<String> thirdRegionIds = supplierList.stream().map(a->a.getRegionThird()).collect(Collectors.toList());
+        List<String> fourthlyRegionIds = supplierList.stream().map(a->a.getRegionFourthly()).collect(Collectors.toList());
         regionIds.addAll(firstRegionIds);
         regionIds.addAll(secondRegionIds);
         regionIds.addAll(thirdRegionIds);
@@ -122,70 +124,78 @@ public class BmsRegionController {
             if(regionList.size()==0){
                 return toTreeNodeList2(allSelectList);
             }
-            Map<Integer,List<BmsRegion>> listMap = regionList.stream().collect(Collectors.groupingBy(BmsRegion::getLevel));
-            List<BmsRegion> list1 = listMap.get(1)==null?new ArrayList<>():listMap.get(1);
-            List<BmsRegion> list2 = listMap.get(2)==null?new ArrayList<>():listMap.get(2);
-            List<BmsRegion> list3 = listMap.get(3)==null?new ArrayList<>():listMap.get(3);
-            List<BmsRegion> list4 = listMap.get(4)==null?new ArrayList<>():listMap.get(4);
 
-            //return allList替换allSelectList代表 返回含该节点下级的数据，当前使用allSelectList
-            List<BmsRegion> allList = new ArrayList<>();
-            if(CollectionUtil.isNotEmpty(list1)){
-                allList.addAll(list1);
-                List<String> lv01Pids = list1.stream().map(BmsRegion::getId).collect(Collectors.toList());
-                List<BmsRegion> level02List = bmsRegionService.listChild(lv01Pids);
-                if(CollectionUtil.isNotEmpty(level02List)){
-                    allList.addAll(level02List);
-                    //list2 去重
-                    list2 = removeExistList(list2, level02List);
-                    List<String> lv02Pids = level02List.stream().map(BmsRegion::getId).collect(Collectors.toList());
-                    List<BmsRegion> level03List = bmsRegionService.listChild(lv02Pids);
-                    if(CollectionUtil.isNotEmpty(level03List)){
-                        allList.addAll(level03List);
-                        //list3 去重
-                        list3 = removeExistList(list3,level03List);
-                        List<String> lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList());
-                        List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
-                        //list4 去重
-                        list4 = removeExistList(list4,level04List);
-                        allList.addAll(level04List);
-                    }
-                }
-            }
-
-            if(CollectionUtil.isNotEmpty(list2)){
-                List<String> lv02Pids = list2.stream().map(BmsRegion::getId).collect(Collectors.toList());
-                List<BmsRegion> level03List = bmsRegionService.listChild(lv02Pids);
-                if(CollectionUtil.isNotEmpty(level03List)){
-                    allSelectList.addAll(level03List);
-                    //list3 去重
-                    list3 = removeExistList(list3,level03List);
-                    List<String> lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList());
-                    List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
-                    //list4 去重
-                    list4 = removeExistList(list4,level04List);
-                    allSelectList.addAll(level04List);
-                }
-                list2.forEach(a->a.setPid("0"));
-                allSelectList.addAll(list2);
-            }
-
-            if(CollectionUtil.isNotEmpty(list3)){
-                List<String> lv03Pids = list3.stream().map(BmsRegion::getId).collect(Collectors.toList());
-                List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
-                //list4 去重
-                list4 = removeExistList(list4,level04List);
-                allSelectList.addAll(level04List);
-                list3.forEach(a->a.setPid("0"));
-                allSelectList.addAll(list3);
-            }
-
-            if(CollectionUtil.isNotEmpty(list4)){
-                //list4 去重
-                list4.forEach(a->a.setPid("0"));
-                allSelectList.addAll(list4);
-            }
-            return toTreeNodeList2(allSelectList);
+            List<String> pathIds = regionList.stream().map(a->a.getPathIds()).collect(Collectors.toList());
+            List<String> idList = pathIds.stream()
+                    .flatMap(pathId -> Arrays.stream(pathId.split("_")))
+                    .collect(Collectors.toList());
+            regionList = bmsRegionService.listByIds(idList);
+            return toTreeNodeList2(regionList);
+//
+//            Map<Integer,List<BmsRegion>> listMap = regionList.stream().collect(Collectors.groupingBy(BmsRegion::getLevel));
+//            List<BmsRegion> list1 = listMap.get(1)==null?new ArrayList<>():listMap.get(1);
+//            List<BmsRegion> list2 = listMap.get(2)==null?new ArrayList<>():listMap.get(2);
+//            List<BmsRegion> list3 = listMap.get(3)==null?new ArrayList<>():listMap.get(3);
+//            List<BmsRegion> list4 = listMap.get(4)==null?new ArrayList<>():listMap.get(4);
+//
+//            //return allList替换allSelectList代表 返回含该节点下级的数据，当前使用allSelectList
+//            List<BmsRegion> allList = new ArrayList<>();
+//            if(CollectionUtil.isNotEmpty(list1)){
+//                allList.addAll(list1);
+//                List<String> lv01Pids = list1.stream().map(BmsRegion::getId).collect(Collectors.toList());
+//                List<BmsRegion> level02List = bmsRegionService.listChild(lv01Pids);
+//                if(CollectionUtil.isNotEmpty(level02List)){
+//                    allList.addAll(level02List);
+//                    //list2 去重
+//                    list2 = removeExistList(list2, level02List);
+//                    List<String> lv02Pids = level02List.stream().map(BmsRegion::getId).collect(Collectors.toList());
+//                    List<BmsRegion> level03List = bmsRegionService.listChild(lv02Pids);
+//                    if(CollectionUtil.isNotEmpty(level03List)){
+//                        allList.addAll(level03List);
+//                        //list3 去重
+//                        list3 = removeExistList(list3,level03List);
+//                        List<String> lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList());
+//                        List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
+//                        //list4 去重
+//                        list4 = removeExistList(list4,level04List);
+//                        allList.addAll(level04List);
+//                    }
+//                }
+//            }
+//
+//            if(CollectionUtil.isNotEmpty(list2)){
+//                List<String> lv02Pids = list2.stream().map(BmsRegion::getId).collect(Collectors.toList());
+//                List<BmsRegion> level03List = bmsRegionService.listChild(lv02Pids);
+//                if(CollectionUtil.isNotEmpty(level03List)){
+//                    allSelectList.addAll(level03List);
+//                    //list3 去重
+//                    list3 = removeExistList(list3,level03List);
+//                    List<String> lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList());
+//                    List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
+//                    //list4 去重
+//                    list4 = removeExistList(list4,level04List);
+//                    allSelectList.addAll(level04List);
+//                }
+//                list2.forEach(a->a.setPid("0"));
+//                allSelectList.addAll(list2);
+//            }
+//
+//            if(CollectionUtil.isNotEmpty(list3)){
+//                List<String> lv03Pids = list3.stream().map(BmsRegion::getId).collect(Collectors.toList());
+//                List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
+//                //list4 去重
+//                list4 = removeExistList(list4,level04List);
+//                allSelectList.addAll(level04List);
+//                list3.forEach(a->a.setPid("0"));
+//                allSelectList.addAll(list3);
+//            }
+//
+//            if(CollectionUtil.isNotEmpty(list4)){
+//                //list4 去重
+//                list4.forEach(a->a.setPid("0"));
+//                allSelectList.addAll(list4);
+//            }
+//            return toTreeNodeList2(allSelectList);
 
         }
         return null;
diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
index f4b04587..7707c2b3 100644
--- a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
+++ b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
@@ -223,7 +223,7 @@ public class SysUser implements Serializable {
     }
 
     public boolean checkSyAccount(boolean throwEx){
-        if(StringUtils.hasText(this.getSyAccount())&&StringUtils.hasText(this.getSyUserId())){
+        if(StringUtils.hasText(this.getSyUserId())){
             return true;
         }
         if(throwEx){
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 4f31b4bd..20429060 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
@@ -434,9 +434,15 @@ public class TbsActivityController {
                     }
                 }
             }
+            List<Long> budgetIds = budgetList.stream().map(a->a.getId()).collect(Collectors.toList());
+            LambdaQueryWrapper<TbsBudgetCondition> lqwCon = new LambdaQueryWrapper<>();
+            lqwCon.in(TbsBudgetCondition::getBudgetId,budgetIds);
+            List<TbsBudgetCondition> budgetConditionsAll = tbsBudgetConditionService.list(lqwCon);
+            Map<Long, List<TbsBudgetCondition>> groupedConditions = budgetConditionsAll.stream()
+                    .collect(Collectors.groupingBy(TbsBudgetCondition::getBudgetId));
             for (TbsBudget budget : budgetList) {
                 if(budget.getConditionFlag().equals(1)){
-                    List<TbsBudgetCondition> budgetConditions = tbsBudgetConditionService.getByBudgetId(budget.getId());
+                    List<TbsBudgetCondition> budgetConditions = groupedConditions.get(budget.getId());
                     for (int i = 0; i < idPaths.size(); i++) {
                         String idPath = idPaths.get(i);
                         boolean isMatch = false;