导出bug修改, 录入人不匹配修改

src/main/java/com/ydtech/modules/inv/model/InvAccountIncoice.java

@@ -54,7 +54,7 @@ public class InvAccountIncoice implements Serializable{
 
     //营业性质
     @ApiModelProperty(value = "营业性质")
-    @ExcelProperty("营业性质")
+    @ExcelProperty("公司类型")
     @TableField(exist = false)
     private String businessQuality;
 

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountIncoiceServiceImpl.java

@@ -383,7 +383,9 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             }
         });
 
-        matchBusinessQuality(invAccountIncoices);
+        if (!StringUtils.isNullOrEmpty(invAccountIncoices) && invAccountIncoices.size() > 0) {
+            matchBusinessQuality(invAccountIncoices);
+        }
 
         File folder = new File(uploadFilePath);
         if (folder.exists()) {
@@ -459,7 +461,9 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         lambdaQuery.orderByDesc(InvAccountIncoice::getInvoiceTime);
 
         Page<InvAccountIncoice> invAccountIncoicePage = page(page, lambdaQuery);
-        invAccountIncoicePage.setRecords(matchBusinessQuality(invAccountIncoicePage.getRecords()));
+        if (!StringUtils.isNullOrEmpty(invAccountIncoicePage.getRecords()) && invAccountIncoicePage.getRecords().size() > 0) {
+            invAccountIncoicePage.setRecords(matchBusinessQuality(invAccountIncoicePage.getRecords()));
+        }
         /**
          * 合计
          */

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -3294,7 +3294,7 @@
         ifa.audituser as auditname,
         ifa.rejectinfo,
         "1" as orderExternalStatus,
-        io.username as recorder
+        iac.operator_name as recorder
         FROM
         ins_fee_audit ifa
         LEFT JOIN