From b88a288f4f787b509463678e3cd9ccfa3f37014b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 11 三月 2026 12:01:05 +0800
Subject: [PATCH] 导入测试
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 a44781e..7d31b27 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
@@ -52,9 +52,6 @@
//鑾峰彇杞﹁締淇℃伅
getPropertyWhiteListFlowDtos(workbook, whiteLists);
- for (PropertyWhiteListFlowDto whiteList : whiteLists){
- whiteList.setCommunityId(paramIn.getString("communityId"));
- }
return whiteLists;
}
@@ -62,18 +59,21 @@
public void setCommunityId(PropertyWhiteListFlowDto po, Object[] os, List<Map<String, Object>> maps) {
for (Map<String, Object> map : maps) {
+ if (ValueUtil.defaultValue(os[1]).isEmpty() && ValueUtil.defaultValue(os[2]).isEmpty()){
+ throw new IllegalArgumentException("灏忓尯鍚嶇О鍜屽皬鍖虹紪鍙峰潎涓虹┖");
+ }
if (ValueUtil.defaultValue(os[1]).isEmpty()) {
- if (ValueUtil.defaultValue(os[2]).equals(map.get("name"))) {
+ if (Vtil.defaultValue(map.get("name")).contains(ValueUtil.defaultValue(os[2]))) {
po.setCommunityId(map.get("communityId").toString());
return;
}
} else if (ValueUtil.defaultValue(os[2]).isEmpty()){
- if (ValueUtil.defaultValue(os[1]).equals(map.get("communityCode"))) {
+ if (Vtil.defaultValue(map.get("communityCode")).equals(ValueUtil.defaultValue(os[1]))) {
po.setCommunityId(map.get("communityId").toString());
return;
}
} else {
- if (ValueUtil.defaultValue(os[1]).equals(map.get("communityCode")) && ValueUtil.defaultValue(os[1]).equals(map.get("name"))) {
+ if (Vtil.defaultValue(map.get("communityCode")).equals(ValueUtil.defaultValue(os[1])) && Vtil.defaultValue(map.get("name")).contains(ValueUtil.defaultValue(os[2]))) {
po.setCommunityId(map.get("communityId").toString());
return;
}
--
Gitblit v1.8.0