详情查看图片

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -485,6 +485,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = busSalesOrderTrailerDetailsVos.get(0);
             BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(busSalesOrderTrailerDetailsVo.getSid());
             String certFile = busSalesOrderTrailer.getCertFile();
+            if (StringUtils.isNotBlank(certFile)){
                 String[] certFiles = certFile.split(",");
                 List<BusSalesOrderTrailerFile> certFiless = new ArrayList<>();
                 for (String path : certFiles) {
@@ -494,7 +495,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     certFiless.add(busSalesOrderTrailerFile);
                 }
                 busSalesOrderTrailerDetailsVo.setCertFile(certFiless);
+            }
             String contractFile = busSalesOrderTrailer.getContractFile();
+            if (StringUtils.isNotBlank(contractFile)){
                 String[] contractFiles = contractFile.split(",");
                 List<BusSalesOrderTrailerFile> contractFiless = new ArrayList<>();
                 for (String path : contractFiles) {
@@ -504,12 +507,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     contractFiless.add(busSalesOrderTrailerFile);
                 }
                 busSalesOrderTrailerDetailsVo.setContractFile(contractFiless);
+            }
             vo.setGc1(busSalesOrderTrailerDetailsVo);
         }else if (busSalesOrderTrailerDetailsVos.size() == 2){
             //挂车1
             BusSalesOrderTrailerDetailsVo gc1 = busSalesOrderTrailerDetailsVos.get(0);
             BusSalesOrderTrailer gcst1 = busSalesOrderTrailerService.fetchBySid(gc1.getSid());
             String certFile1 = gcst1.getCertFile();
+            if (StringUtils.isNotBlank(certFile1)){
                 String[] certFiles1 = certFile1.split(",");
                 List<BusSalesOrderTrailerFile> certFiless1 = new ArrayList<>();
                 for (String path : certFiles1) {
@@ -519,7 +524,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     certFiless1.add(busSalesOrderTrailerFile);
                 }
                 gc1.setCertFile(certFiless1);
+            }
             String contractFile1 = gcst1.getContractFile();
+            if (StringUtils.isNotBlank(contractFile1)){
                 String[] contractFiles1 = contractFile1.split(",");
                 List<BusSalesOrderTrailerFile> contractFiless1 = new ArrayList<>();
                 for (String path : contractFiles1) {
@@ -529,10 +536,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     contractFiless1.add(busSalesOrderTrailerFile);
                 }
                 gc1.setContractFile(contractFiless1);
+            }
             //挂车2
             BusSalesOrderTrailerDetailsVo gc2 = busSalesOrderTrailerDetailsVos.get(1);
             BusSalesOrderTrailer gcst2 = busSalesOrderTrailerService.fetchBySid(gc2.getSid());
             String certFile2 = gcst2.getCertFile();
+            if (StringUtils.isNotBlank(certFile2)){
                 String[] certFiles2 = certFile2.split(",");
                 List<BusSalesOrderTrailerFile> certFiless2 = new ArrayList<>();
                 for (String path : certFiles2) {
@@ -542,7 +551,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     certFiless2.add(busSalesOrderTrailerFile);
                 }
                 gc2.setCertFile(certFiless2);
+            }
             String contractFile2 = gcst1.getContractFile();
+            if (StringUtils.isNotBlank(contractFile2)){
                 String[] contractFiles2 = contractFile2.split(",");
                 List<BusSalesOrderTrailerFile> contractFiless2 = new ArrayList<>();
                 for (String path : contractFiles2) {
@@ -552,6 +563,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     contractFiless2.add(busSalesOrderTrailerFile);
                 }
                 gc2.setContractFile(contractFiless2);
+            }
             vo.setGc1(gc1);
             vo.setGc2(gc2);
         }