From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
index 8395634..ecfe426 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
@@ -55,16 +55,20 @@
if (oList.get(osIndex)[0] == null) {
break;
}
- Object[] os = new Object[168];
- System.arraycopy(oList.get(osIndex), 0, os, 0, oList.get(osIndex).length);
- Assert.hasValue(os[3], (osIndex + 1) + "琛岄」鐩紪鐮佷笉鑳戒负绌�");
+ Object[] os = new Object[170];
+ try {
+ System.arraycopy(oList.get(osIndex), 0, os, 0, oList.get(osIndex).length);
+ } catch (ArrayIndexOutOfBoundsException e) {
+ throw new IllegalArgumentException("Excel闀垮害杩囬暱锛�");
+ }
+// Assert.hasValue(os[3], (osIndex + 1) + "琛岄」鐩紪鐮佷笉鑳戒负绌�");
Assert.hasValue(os[5], (osIndex + 1) + "琛岃矾涓嶈兘涓虹┖");
Assert.hasValue(os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
Assert.hasValue(os[8], (osIndex + 1) + "琛屽鍙蜂笉鑳戒负绌�");
- Assert.hasValue(os[9], (osIndex + 1) + "琛岄棬瀹ゅ彿涓嶈兘涓虹┖");
+// Assert.hasValue(os[9], (osIndex + 1) + "琛岄棬瀹ゅ彿涓嶈兘涓虹┖");
Assert.hasValue(os[10], (osIndex + 1) + "琛屼笟涓诲湴鍧�涓嶈兘涓虹┖");
Assert.hasValue(os[16], (osIndex + 1) + "琛屼綇瀹呴潰绉笉鑳戒负绌�");
- os[167] = result.getUserId();
+ os[169] = result.getUserId();
ownerRoomDtos.add(os);
@@ -79,20 +83,23 @@
if (oList.get(osIndex)[0] == null) {
break;
}
- Object[] os = new Object[168];
+ Object[] os = new Object[170];
System.arraycopy(oList.get(osIndex), 0, os, 0, oList.get(osIndex).length);
- Assert.hasValue(os[3], (osIndex + 1) + "琛岄」鐩紪鐮佷笉鑳戒负绌�");
+// Assert.hasValue(os[3], (osIndex + 1) + "琛岄」鐩紪鐮佷笉鑳戒负绌�");
Assert.hasValue(os[5], (osIndex + 1) + "琛岃矾涓嶈兘涓虹┖");
Assert.hasValue(os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
Assert.hasValue(os[8], (osIndex + 1) + "琛屽鍙蜂笉鑳戒负绌�");
- Assert.hasValue(os[9], (osIndex + 1) + "琛岄棬瀹ゅ彿涓嶈兘涓虹┖");
+// Assert.hasValue(os[9], (osIndex + 1) + "琛岄棬瀹ゅ彿涓嶈兘涓虹┖");
Assert.hasValue(os[10], (osIndex + 1) + "琛屼笟涓诲湴鍧�涓嶈兘涓虹┖");
Assert.hasValue(os[16], (osIndex + 1) + "琛屼綇瀹呴潰绉笉鑳戒负绌�");
- os[167] = result.getUserId();
+ os[169] = result.getUserId();
ownerRoomDtos.add(os);
}
+ if (ownerRoomDtos.size() == 0) {
+ throw new IllegalArgumentException("sheet鍐呭涓虹┖");
+ }
}
--
Gitblit v1.8.0