From 7e5814d0c1549cafe70423aa62e64e8afe23d5ad Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 17 Jan 2023 14:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E3=80=81?=
 =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/bms/controller/BmsSupplierController.java  | 1 +
 .../modules/his/service/impl/HisUserSupplierServiceImpl.java | 2 +-
 .../qs/serve/modules/tbs/controller/TbsBudgetController.java | 5 +----
 .../modules/tbs/service/impl/TbsCostApplyServiceImpl.java    | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
index 9396d9e2..5ce61dbb 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
+++ b/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());
diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
index f471031e..b43e5466 100644
--- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
+++ b/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()
diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
index b9589d23..3bcd639d 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
+++ b/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();
     }
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
index c680d3f6..4dc0ae0e 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
+++ b/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)){