From d0b19298e28a9b8b50c778704b77160f17e73950 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期五, 17 四月 2026 18:20:38 +0800
Subject: [PATCH] 水电话费
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
index bfe9004..c7a0be4 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
@@ -88,8 +88,14 @@
private void getPropertyWhiteListFlowDtos(Workbook workbook, List<PropertyWhiteListFlowDto> whiteLists) {
Sheet sheet = null;
- sheet = ImportExcelUtils.getSheet(workbook, "鐧藉崟娴佹按 瀵煎叆鏂版ā鏉�");
- List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
+ List<Object[]> oList;
+ try {
+ sheet = ImportExcelUtils.getSheet(workbook, "鐧藉崟娴佹按 瀵煎叆鏂版ā鏉�");
+ oList = ImportExcelUtils.listFromSheet(sheet);
+ } catch (IllegalArgumentException e) {
+ sheet = ImportExcelUtils.getSheet(workbook, "Sheet1");
+ oList = ImportExcelUtils.listFromSheet(sheet);
+ }
PropertyWhiteListFlowDto white = null;
List<Map<String, Object>> maps = BeanConvertUtil.beanCovertMapListC(communityInnerServiceSMOImpl.queryCommunitys(new CommunityDto()));
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
@@ -97,7 +103,7 @@
if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if (StringUtil.isNullOrNone(os[3])) {
+ if (os == null || os.length < 4 || StringUtil.isNullOrNone(os[3])) {
continue;
}
Assert.hasValue(os[3], (osIndex + 1) + "琛屾敹璐规棩鏈熶笉鑳戒负绌�");
--
Gitblit v1.8.0