From 60ea6934d17d1b0556aab78d9811dbcf26f1260e Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 15 Nov 2023 18:35:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BA=BF=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DistributionStockArticleController.java | 8 ++++---- .../service/impl/DistributionStockListServiceImpl.java | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) 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 96c3f11f9..e6c150d14 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 @@ -247,10 +247,10 @@ public class DistributionStockArticleController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockArticle") public R> clientList(@ApiIgnore DistributionStockArticleVO distributionStockArticle, Query query) { - BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if (Func.isEmpty(myCurrentWarehouse)){ - return R.fail("无仓库信息!!!"); - } +// BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); +// if (Func.isEmpty(myCurrentWarehouse)){ +// return R.fail("无仓库信息!!!"); +// } //获取当前登录人仓库 // List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); // List collect = myWatchWarehouse.stream() diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java index a7404f6ee..864358e23 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java @@ -47,6 +47,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.secure.utils.AuthUtil; @@ -368,7 +369,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl basicdataClientUserEntityListByUserIds = basicdataClientClient.getBasicdataClientUserEntityListByUserId(AuthUtil.getUserId()); List clientIds =null; if(Func.isNotEmpty(basicdataClientUserEntityListByUserIds)){ - clientIds = basicdataClientUserEntityListByUserIds.stream().map(e -> e.getId()).collect(Collectors.toList()); + clientIds = basicdataClientUserEntityListByUserIds.stream().map(BaseEntity::getId).collect(Collectors.toList()); } IPage page1= baseMapper.pageClinet(page,distributionStockListEntity,clientIds); return page1;