Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -396,7 +396,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         qw.eq("bo.payTypeKey", "2");
         qw.eq("bs.busState", "401");
         qw.eq("bs.finState", "1");
-        //qw.eq("bs.manageState", "1");
+        qw.eq("bs.manageState", "1");
         qw.eq("bs.carryInvoiceState", "0");
         qw.eq("bs.invoiceApplyState", "0");
         qw.eq("bo.useOrgSid", useOrgSid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -193,13 +193,16 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         qw.orderByDesc("lf.createTime");
         IPage<LoanFileexamine> page = PagerUtil.queryToPage(pq);
         IPage<LoanFileexamineVo> pagging = baseMapper.selectPageVo(page, qw);
-        for (LoanFileexamineVo record : pagging.getRecords()) {
-            List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndXdConSid(record.getSaleOrderSid(), record.getLoanContractSid()).getData();
-            String vinNos = "";
-            for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
-                vinNos = vinNos + busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8) + ",";
+        List<LoanFileexamineVo> records = pagging.getRecords();
+        if (records != null && records.size() > 0){
+            for (LoanFileexamineVo record : records) {
+                List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndXdConSid(record.getSaleOrderSid(), record.getLoanContractSid()).getData();
+                String vinNos = "";
+                for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+                    vinNos = vinNos + busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8) + ",";
+                }
+                record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
             }
-            record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
         }
         PagerVo<LoanFileexamineVo> p = PagerUtil.pageToVo(pagging, null);
         return p;