From 5efeaac8ef3304e72d7f4d2c21c2e423f99a791d Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 20 Sep 2024 16:58:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AEexce?=
 =?UTF-8?q?l=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/standardComplianceCheck/entity/vo/ModelExcelVO.java | 2 +-
 .../service/impl/ProcessStandardComplianceCheckServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java
index 30a7c580..c4f3ff7c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/ModelExcelVO.java
@@ -23,7 +23,7 @@ public class ModelExcelVO {
 
     public boolean emptyRowOrNot() {
         ModelExcelVO modelExcel = this;
-        return modelExcel.getModel() == null && modelExcel.getModelState() == null;
+        return modelExcel.getModel() == null;
     }
 
     // 预定义的Excel头部字段
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index 6eff5a26..66af94d8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -823,7 +823,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
 
         while (iterator.hasNext()) {
             ModelExcelVO data = iterator.next();
-            if (ExcelUtils.isEmptyRow(data)) {
+            if (data.emptyRowOrNot()) {
                 iterator.remove();
                 if (list.isEmpty()) {
                     errorMsgs.add("文件暂无数据，请检查后重试。");