Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

# Conflicts:
#	njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java

@@ -171,17 +171,24 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
 
         String uscc = searchCompanyParam.getUscc();
         AuditStatus auditStatus = searchCompanyParam.getAuditStatus();
+        String aStatus = "";
+        if (null != auditStatus) {
+            aStatus = auditStatus.getVal();
+        }
         String companyName = searchCompanyParam.getCompanyName();
         String legalRepresentative = searchCompanyParam.getLegalRepresentative();
         Integer station = searchCompanyParam.getStation();
         return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query()
+//                .eq("a.station", Boolean.FALSE)
+                .eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus)
                 .eq("a.station", station != null && station == 1)
-                .eq(auditStatus != null, "a.audit_status", auditStatus)
+//                .eq(StrUtil.isNotBlank(searchCompanyParam.getStation()), "a.station", searchCompanyParam.getStation())
                 .in(CollUtil.isNotEmpty(bizObjList), "b.biz_obj", bizObjList)
                 .like(StrUtil.isNotBlank(companyName), "a.company_name", companyName)
                 .like(StrUtil.isNotBlank(legalRepresentative), "a.legal_representative", legalRepresentative)
                 .like(StrUtil.isNotBlank(uscc), "a.uscc", uscc)
         ));
+
     }
 
     @Transactional(rollbackFor = Exception.class)