|
|
|
@ -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<BasicdataD
|
|
|
|
|
public List<BasicdataDriverArteryVO> getDriverList() { |
|
|
|
|
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); |
|
|
|
|
if (Func.isEmpty(myCurrentWarehouse)){ |
|
|
|
|
log.error("################无当前登录人仓库信息:{}",myCurrentWarehouse); |
|
|
|
|
log.error("################getDriverList 无当前登录人仓库信息:{}",myCurrentWarehouse); |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
log.info("################ getDriverList 仓库信息:{}",myCurrentWarehouse); |
|
|
|
|
ArrayList<BasicdataDriverArteryVO> basicdataDriverArteryVOS = new ArrayList<>(); |
|
|
|
|
List<BasicdataDriverArteryEntity> list = this.list(); |
|
|
|
|
log.info("################getDriverList list:{}",list); |
|
|
|
|
//Stream<BasicdataDriverArteryEntity> basicdataDriverArteryEntityStream = list.stream().filter(l -> l.getWarehouseId().contains(myCurrentWarehouse.getId().toString()));
|
|
|
|
|
Stream<BasicdataDriverArteryEntity> basicdataDriverArteryEntityStream = list.stream().filter(l -> Func.isNotEmpty(l.getWarehouseId()) && l.getWarehouseId().contains(myCurrentWarehouse.getId().toString())); |
|
|
|
|
if (Func.isNotEmpty(basicdataDriverArteryEntityStream)){ |
|
|
|
|
basicdataDriverArteryEntityStream.forEach(l->{ |
|
|
|
|