修复客户、预算显示异常

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -91,6 +91,7 @@ public class BmsSupplierController {
             hisUserSupplierService.initByUserId(userId,false);
             HisUserSupplier userSupplier = param.toHisUserSupplier(userId,null);
             LambdaQueryWrapper<HisUserSupplier> lqw = new LambdaQueryWrapper<>(userSupplier);
+            lqw.ne(HisUserSupplier::getSupplierId,0);
             PageHelper.startPage(param.getPageNum(),param.getPageSize());
             List<HisUserSupplier> list = hisUserSupplierService.list(lqw);
             List<BmsSupplier> supplierList = list.stream().map(HisUserSupplier::toSupplier).collect(Collectors.toList());

src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java

@@ -77,7 +77,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
             for (Integer level : saleRegionsMap.keySet()) {
                 List<BmsRegion> saleRegionListByLevel = saleRegionsMap.get(level);
                 List<String> regionIds = saleRegionListByLevel.stream().map(BmsRegion::getId).collect(Collectors.toList());
-                toHisUserSupplier(userSuppliers,0,regionIds,3,userId);
+                toHisUserSupplier(userSuppliers,0,regionIds,level,userId);
             }
         }
         List<String> regionBizIds = regionUsers.stream()

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java

@@ -127,10 +127,7 @@ public class TbsBudgetController {
     @SysLog(module = SystemModule.Budget, title = "预算", biz = BizType.UPDATE)
     @PreAuthorize("hasRole('tbs:budget:update')")
     public R<?> updateById(@RequestBody @Valid TbsBudgetStateBo param){
-        TbsBudget budget = new TbsBudget();
-        budget.setId(param.getId());
-        budget.setBudgetState(1);
-        tbsBudgetService.updateById(budget);
+        tbsBudgetService.startBudget(param.getId());
         return R.ok();
     }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -134,7 +134,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                     currActivity = activity;
                 }
             }
-            TbsBudgetLog budgetLog = budgetLogService.buildTbsBudgetLog(0,sysUser, costApply, item, budget,item.getCenterGoodsAmount().negate(),currActivity);
+            TbsBudgetLog budgetLog = budgetLogService.buildTbsBudgetLog(1,sysUser, costApply, item, budget,item.getCenterGoodsAmount().negate(),currActivity);
             budgetLogList.add(budgetLog);
         }
         if(CollectionUtil.isNotEmpty(budgetLogList)){