From 67e1e623bdd4b59ac5f1bdb16363a66a511ebdaa Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期二, 20 五月 2025 12:31:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

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;

--
Gitblit v1.9.3