Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -762,29 +762,32 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         //车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、
         //回购日期发生变化，重新生成欠款提车担保承诺书
         if (StringUtils.isBlank(sid)) {
-            //生成新车买卖合同（欠款）
+         /*   //生成新车买卖合同（欠款）
             carContractDownloadUrl = carContractDownloadUrl(dto, map);
+            //生成欠款提车担保承诺书
+            guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
+            //生成总经理担保书
+            zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
+            //生成股东会对外担保决议
+            gdLetterDownloadUrl = gdLetterDownloadUrl();*/
             PdfVo pdfVo = new PdfVo();
             pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
             pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
             pdfVo.setDownUrl(carContractDownloadUrl);
             list.add(pdfVo);
-            //生成股东会对外担保决议
-            gdLetterDownloadUrl = gdLetterDownloadUrl();
+
             pdfVo = new PdfVo();
             pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
             pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
             pdfVo.setDownUrl(gdLetterDownloadUrl);
             list.add(pdfVo);
-            //生成总经理担保书
-            zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
+
             pdfVo = new PdfVo();
             pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
             pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
             pdfVo.setDownUrl(zjlLetterDownloadUrl);
             list.add(pdfVo);
-            //生成欠款提车担保承诺书
-            guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
+
             pdfVo = new PdfVo();
             pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
             pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
@@ -825,13 +828,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             if (isChange) {
                 //生成新车买卖合同（欠款）
-                carContractDownloadUrl = carContractDownloadUrl(dto, map);
+//                carContractDownloadUrl = carContractDownloadUrl(dto, map);
                 //生成总经理担保书
-                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
+//                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
             }
             if (dateChange || isChange) {
                 //生成欠款提车担保承诺书
-                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
+//                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
             }
             //新车买卖合同（欠款）
             PdfVo pdfVo = new PdfVo();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@@ -264,7 +264,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
     public int myUpdateBySid(FinVehicleInvoiceDto dto, String sid) {
         StringBuilder sb = new StringBuilder();
         String urlPrefix = fileUploadComponent.getUrlPrefix();
-        if (null != dto.getFilePaths()) {
+        if (null != dto.getFilePaths() && !dto.getFilePaths().isEmpty()) {
             for (String filePath : dto.getFilePaths()) {
                 String path = filePath.substring(urlPrefix.length());
                 sb.append(path).append(",");
@@ -295,7 +295,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
         finVehicleInvoice.setSid(sidAdd);
         StringBuilder sb = new StringBuilder();
         String urlPrefix = fileUploadComponent.getUrlPrefix();
-        if (null != dto.getFilePaths()) {
+        if (null != dto.getFilePaths() && !dto.getFilePaths().isEmpty()) {
             for (String filePath : dto.getFilePaths()) {
                 String path = filePath.substring(urlPrefix.length());
                 sb.append(path).append(",");

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -86,8 +86,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 solutionsDetailsVo.setGcPrice(appOrderPriceInfoVo.getGcPrice());
                 solutionsDetailsVo.setSzPrice(appOrderPriceInfoVo.getSzPrice());
             }
-
-
         }
         if (loanSolutions == null) {
             return rb.success().setData(solutionsDetailsVo).setCode("20000");