diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
index 1e8a362c2..ad80667a7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
@@ -2,6 +2,7 @@ package org.nl.b_lms.bst.ivt.papervehicle.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -110,10 +112,12 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl<MdPbPapervehicleMap
     @Override
     public List<String> getTubeCodesByVehicle(String vehicleCode) {
         LambdaQueryWrapper<MdPbPapervehicle> lam = new LambdaQueryWrapper<>();
-        lam.eq(MdPbPapervehicle::getVehicle_code, vehicleCode);
+        lam.eq(MdPbPapervehicle::getVehicle_code, vehicleCode)
+                .isNotNull(MdPbPapervehicle::getMaterial_code)
+                .ne(MdPbPapervehicle::getMaterial_code, "");
         List<MdPbPapervehicle> list = list(lam);
         if (list.size() == 0) {
-            return null;
+            return new ArrayList<>();
         }
         return list.stream().map(MdPbPapervehicle::getMaterial_code).distinct().collect(Collectors.toList());
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java
index b5e7f8beb..d67cf84a6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java
@@ -24,6 +24,7 @@ import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -109,7 +110,7 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl<BstIvtShafttubeiv
     @Override
     public List<BstIvtShafttubeivt> getAllByPointType(String type, boolean flag) {
         if (ObjectUtil.isEmpty(type)) {
-            return null;
+            return new ArrayList<>();
         }
         LambdaQueryWrapper<BstIvtShafttubeivt> lam = new QueryWrapper<BstIvtShafttubeivt>().lambda();
         lam.eq(BstIvtShafttubeivt::getPoint_type, type)