1.修改线上报错

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<IPage<DistributionStockArticleVO>> 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<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
 //		List<Long> collect = myWatchWarehouse.stream()

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<Distributi
 		List<BasicdataClientEntity> 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<DistributionStockListVO> page1= baseMapper.pageClinet(page,distributionStockListEntity,clientIds);
 		return  page1;