Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java

@@ -359,12 +359,15 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             loanVehClearanceVehFiles.add(loanVehClearanceVehFile3);
             //金融方案sid
             LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrder.getSid());
+            if (loanSolutions != null){
                 LoanVehClearanceVehFile loanVehClearanceVehFile4 = new LoanVehClearanceVehFile();
                 loanVehClearanceVehFile4.setName("金融方案");
                 loanVehClearanceVehFile4.setSid(loanSolutions.getSid());
                 loanVehClearanceVehFiles.add(loanVehClearanceVehFile4);
+            }
             //家访考察报告sid
             String jfkcSid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle1.getBorrowerSid());
+            if (StringUtils.isNotBlank(jfkcSid)) {
                 LoanVehClearanceVehFile loanVehClearanceVehFile5 = new LoanVehClearanceVehFile();
                 loanVehClearanceVehFile5.setName("家访考察报告");
                 loanVehClearanceVehFile5.setSid(jfkcSid);
@@ -374,6 +377,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                 loanVehClearanceVehFile6.setName("家访考察资料");
                 loanVehClearanceVehFile6.setSid(jfkcSid);
                 loanVehClearanceVehFiles.add(loanVehClearanceVehFile6);
+            }
             loanVehClearanceVehDetailsVo.setSids(loanVehClearanceVehFiles);
         }
         vo.setLoanVehClearanceVehList(loanVehClearanceVehDetailsVoList);
@@ -440,6 +444,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             loanVehClearanceVehFiles.add(LoanVehClearanceVehFile4);
             //家访考察报告sid
             String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid());
+            if (StringUtils.isNotBlank(sid)) {
                 LoanVehClearanceVehFile LoanVehClearanceVehFile5 = new LoanVehClearanceVehFile();
                 LoanVehClearanceVehFile5.setName("家访考察报告");
                 LoanVehClearanceVehFile5.setSid(sid);
@@ -449,6 +454,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                 LoanVehClearanceVehFile6.setName("家访考察资料");
                 LoanVehClearanceVehFile6.setSid(sid);
                 loanVehClearanceVehFiles.add(LoanVehClearanceVehFile6);
+            }
             loanVehClearanceVehDetailsVo.setSids(loanVehClearanceVehFiles);
             loanVehClearanceVehDetailsVoList.add(loanVehClearanceVehDetailsVo);
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/bzc.ftl

@@ -1480,7 +1480,6 @@
                                     <w:sz w:val="15"/>
                                     <w:sz-cs w:val="15"/>
                                 </w:rPr>
-                                <w:t>　</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -1574,7 +1573,6 @@
                                     <w:sz w:val="15"/>
                                     <w:sz-cs w:val="15"/>
                                 </w:rPr>
-                                <w:t>　</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -1757,7 +1755,6 @@
                                     <w:sz w:val="15"/>
                                     <w:sz-cs w:val="15"/>
                                 </w:rPr>
-                                <w:t>　</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -1851,7 +1848,6 @@
                                     <w:sz w:val="15"/>
                                     <w:sz-cs w:val="15"/>
                                 </w:rPr>
-                                <w:t>　</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -1945,7 +1941,6 @@
                                     <w:sz w:val="15"/>
                                     <w:sz-cs w:val="15"/>
                                 </w:rPr>
-                                <w:t>　</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>