From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
index 52a2800..0447401 100755
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -526,7 +526,7 @@
paramIn.put("communityId", result.getCommunityId());
paramIn.put("floorNum", importFloor.getFloorNum());
paramIn.put("userId", result.getUserId());
- paramIn.put("name", importFloor.getFloorNum() + "鍙锋ゼ");
+ paramIn.put("name", importFloor.getFloorNum() + "鏍�");
paramIn.put("floorArea", 1.00);
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
@@ -786,7 +786,7 @@
Assert.hasValue(os[3], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬫ゼ灞備负绌�");
Assert.hasValue(os[4], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬫埛鍨嬩负绌�");
Assert.hasValue(os[5], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屽缓绛戦潰绉负绌�");
- if (!StringUtil.isNullOrNone(os[6])) {
+ if (os.length > 6 && !StringUtil.isNullOrNone(os[6])) {
Assert.hasValue(os[7], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬭垂鐢ㄤ负绌�");
Assert.hasValue(os[8], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛岃垂鐢ㄥ埌鏈熸椂闂翠负绌�");
}
@@ -797,17 +797,18 @@
importRoom.setSection(os[4].toString());
importRoom.setBuiltUpArea(Double.parseDouble(os[5].toString()));
- if (!StringUtil.isNullOrNone(os[6])) {
+ if (os.length > 6 && !StringUtil.isNullOrNone(os[6])) {
importRoom.setRoomFeeId(os[7].toString());
importRoom.setFeeEndDate(os[8].toString());
}
- if (StringUtil.isNullOrNone(os[6])) {
+ if (os.length < 7 || StringUtil.isNullOrNone(os[6])) {
rooms.add(importRoom);
continue;
}
importRoom.setImportOwner(getImportOwner(owners, os[6].toString()));
rooms.add(importRoom);
} catch (Exception e) {
+ logger.error("鎴垮眿鏁版嵁鏍￠獙澶辫触", e);
throw new IllegalArgumentException("鎴垮眿淇℃伅sheet涓" + (osIndex + 1) + "琛屾暟鎹敊璇紝璇锋鏌�" + e.getLocalizedMessage());
}
}
--
Gitblit v1.8.0