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 lqw = new LambdaQueryWrapper<>(userSupplier); + lqw.ne(HisUserSupplier::getSupplierId,0); PageHelper.startPage(param.getPageNum(),param.getPageSize()); List list = hisUserSupplierService.list(lqw); List 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 saleRegionListByLevel = saleRegionsMap.get(level); List regionIds = saleRegionListByLevel.stream().map(BmsRegion::getId).collect(Collectors.toList()); - toHisUserSupplier(userSuppliers,0,regionIds,3,userId); + toHisUserSupplier(userSuppliers,0,regionIds,level,userId); } } List 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