diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index df272fe40..b8e2438cb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -103,7 +103,7 @@ public class DistributionStockArticleController extends BladeController { @GetMapping("/clientList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockArticle") - public R> clientList(@ApiIgnore @RequestParam DistributionStockArticleVO distributionStockArticle, Query query) { + public R> clientList(@ApiIgnore DistributionStockArticleVO distributionStockArticle, Query query) { IPage pages = distributionStockArticleService.selectClientListPage(Condition.getPage(query), distributionStockArticle); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 3eae21590..f735462b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -76,7 +76,7 @@ SELECT client_id from logpm_basicdata_clientuser where user_id =#{loginUserId} ) and - ldsa.is_deleted = 0 and lds.type_service ='2' + ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.order_self_numbering == #{distributionStockArticleVO.orderSelfNumbering}