From ddc89794e706cd35e2f43543a345148e30a0a91f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 03 Jan 2023 16:42:21 +0800
Subject: [PATCH] 修改浑南模板格式问题
---
screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java
index 6d539cf..2c5cfb9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HnExcelServiceImpl.java
@@ -631,6 +631,9 @@
continue;
}
short lastCellNum = row.getLastCellNum();
+ if (lastCellNum<=0){
+ continue;
+ }
Object[] objects = new Object[lastCellNum];
for (int j = 0; j < lastCellNum; j++) {
@@ -644,7 +647,7 @@
HashMap<String, Object> map1 = new HashMap<>();
HashMap<String, Object> map2 = new HashMap<>();
- if (objects.length == 8) {
+ if (objects.length == 8 || objects.length == 9) {
if (objects[0]!=null){
if (!objects[1].toString().contains("H")
&& !objects[2].toString().contains("H")
--
Gitblit v1.8.0