From f958e4e94f8339d081e70e79898cd4758c1e924a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期二, 20 五月 2025 10:47:52 +0800
Subject: [PATCH] 修改空单元格判断

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java |    3 +++
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelinePredictionServiceImpl.java          |    4 ++++
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java                  |    3 +++
 3 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java
index c392f97..41d23c6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java
@@ -118,6 +118,9 @@
             /*鏁版嵁鍒椾粠1寮�濮�*/
             for (int i = 1; i <= rows; i++) {
                 Row row = sheet.getRow(i);
+                if (row.getCell(0) == null){
+                    continue;
+                }
                 String mo = row.getCell(0).getStringCellValue();
                 if (StringUtils.isEmpty(mo)){
                     continue;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelinePredictionServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelinePredictionServiceImpl.java
index 7a85b16..cf3d710 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelinePredictionServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelinePredictionServiceImpl.java
@@ -121,6 +121,10 @@
             /*鏁版嵁鍒椾粠1寮�濮�*/
             for (int i = 1; i <= rows; i++) {
                 Row row = sheet.getRow(i);
+                if (row.getCell(0) == null){
+                    continue;
+                }
+
                 String materialCode = row.getCell(0).getStringCellValue();
                 if (StringUtils.isEmpty(materialCode)){
                     continue;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java
index 18cb143..84aab1d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java
@@ -122,6 +122,9 @@
             /*鏁版嵁鍒椾粠1寮�濮�*/
             for (int i = 1; i <= rows; i++) {
                 Row row = sheet.getRow(i);
+                if (row.getCell(0) == null) {
+                    continue;
+                }
                 String materialCode = row.getCell(0).getStringCellValue();
                 if (StringUtils.isEmpty(materialCode)){
                     continue;

--
Gitblit v1.9.3