From dd1992ab1a96ed50f080be37003f16a3fd151349 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Tue, 7 Nov 2023 23:33:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AF=BB=E6=89=BE=E9=97=AE=E9=A2=981?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BasicdataDriverArteryServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java index 8744633b7..61dbe85bf 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.logpm.basic.entity.BasicDelineMiddleEntity; import com.logpm.basicdata.dto.BasicdataDriverArteryDTO; import com.logpm.basicdata.entity.*; @@ -114,11 +115,14 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl getDriverList() { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if (Func.isEmpty(myCurrentWarehouse)){ - log.error("################无当前登录人仓库信息:{}",myCurrentWarehouse); + log.error("################getDriverList 无当前登录人仓库信息:{}",myCurrentWarehouse); return null; } + log.info("################ getDriverList 仓库信息:{}",myCurrentWarehouse); ArrayList basicdataDriverArteryVOS = new ArrayList<>(); List list = this.list(); + log.info("################getDriverList list:{}",list); + //Stream basicdataDriverArteryEntityStream = list.stream().filter(l -> l.getWarehouseId().contains(myCurrentWarehouse.getId().toString())); Stream basicdataDriverArteryEntityStream = list.stream().filter(l -> Func.isNotEmpty(l.getWarehouseId()) && l.getWarehouseId().contains(myCurrentWarehouse.getId().toString())); if (Func.isNotEmpty(basicdataDriverArteryEntityStream)){ basicdataDriverArteryEntityStream.forEach(l->{