fix: 企业导出调整

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -177,8 +177,8 @@ public class CompanyController {
                                @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode,
                                @RequestParam(required = false) String siteID, @RequestParam(required = false) Date startDate,
                                @RequestParam(required = false) Date endDate,@RequestParam(required = false) String postCountSorter,
-                               @RequestParam(required = false)String companyTypeID,@RequestParam(required = false)String industryID,
-                               @RequestParam(required = false) String createUserName, @RequestParam Integer dataSource) throws Exception {
+                               @RequestParam(required = false)String companyTypeID,@RequestParam(required = false) String industryID,
+                               @RequestParam(required = false) String createUserName, @RequestParam(required = false) Integer dataSource) throws Exception {
         PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, null, null, null, siteID, startDate, endDate, postCountSorter,companyTypeID,industryID, createUserName, dataSource);
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
@@ -190,7 +190,6 @@ public class CompanyController {
             List<List<Object>> rowDatas = new ArrayList();
             for (CompanyVo item : result.getList()) {
                 List<Object> row = new ArrayList();
-                String recordName = item.recordStatus == 1 ? "在营" : "关闭";
                 ++i;
                 row.add(i);
                 row.add(item.companyName);
@@ -198,7 +197,9 @@ public class CompanyController {
                 row.add(item.streetName);
                 row.add(item.SiteName);
                 row.add(item.companyCode);
-                row.add(recordName);
+                if (item.recordStatus != null) {
+                    row.add(item.recordStatus == 1 ? "在营" : "关闭");
+                }
                 row.add(item.insuredCount);
                 row.add(item.companyModelType);
                 row.add(item.postCount);

src/main/resources/mapping/cquery/CompanyCQuery.xml

@@ -87,10 +87,10 @@
         <if test="createUserName!='' and createUserName!=null">
             and u.`Name` like Concat('%',#{createUserName},'%')
         </if>
-        <if test="dataSource != '' and dataSource == 1">
+        <if test="dataSource != null and dataSource != '' and dataSource == 1">
             and company.OracleTableID is null
         </if>
-        <if test="dataSource != '' and dataSource == 2">
+        <if test="dataSource != null and dataSource != '' and dataSource == 2">
             and company.OracleTableID is not null
         </if>
         order by