|
|
|
@ -137,7 +137,7 @@ public class BasicdataDriverArteryController extends BladeController {
|
|
|
|
|
List<BasicdataDriverWarehouseEntity> warehouseEntities = basicdataDriverWarehouseService.list(Wrappers.<BasicdataDriverWarehouseEntity>lambdaQuery().eq(BasicdataDriverWarehouseEntity::getWarehouseId, basicdataDriverArtery.get("warehouseId"))); |
|
|
|
|
if (CollUtil.isNotEmpty(warehouseEntities)) { |
|
|
|
|
Set<Long> collect = warehouseEntities.stream().map(BasicdataDriverWarehouseEntity::getDriverId).collect(Collectors.toSet()); |
|
|
|
|
List<BasicdataDriverArteryEntity> list = basicdataDriverArteryService.list(Wrappers.<BasicdataDriverArteryEntity>lambdaQuery().in(BasicdataDriverArteryEntity::getId, collect)); |
|
|
|
|
List<BasicdataDriverArteryEntity> list = basicdataDriverArteryService.list(Wrappers.<BasicdataDriverArteryEntity>lambdaQuery().in(BasicdataDriverArteryEntity::getId, collect).isNotNull(BasicdataDriverArteryEntity::getUserId)); |
|
|
|
|
return R.data(list); |
|
|
|
|
} |
|
|
|
|
return R.data(null); |
|
|
|
|