From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
index 10af640..835edd3 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
@@ -73,6 +73,14 @@
return false;
}
+ private boolean hasRoomSpecialCharacters(String str) {
+ if ( str.contains("#") || str.contains("?") || str.contains("&")) {
+ return true;
+ }
+
+ return false;
+ }
+
/**
* 鏁版嵁鏍煎紡鏍￠獙
*
@@ -91,8 +99,8 @@
if (hasSpecialCharacters(importOwnerRoomDto.getUnitNum())) {
throw new IllegalArgumentException((roomIndex + 1) + "琛屽崟鍏冧腑鍖呭惈鐗规畩绗﹀彿 - # 锛� & 璇峰垹闄わ紒");
}
- if (hasSpecialCharacters(importOwnerRoomDto.getRoomNum())) {
- throw new IllegalArgumentException((roomIndex + 1) + "琛屽崟鍏冧腑鍖呭惈鐗规畩绗﹀彿 - # 锛� & 璇峰垹闄わ紒");
+ if (hasRoomSpecialCharacters(importOwnerRoomDto.getRoomNum())) {
+ throw new IllegalArgumentException((roomIndex + 1) + "琛屾埧灞嬩腑鍖呭惈鐗规畩绗﹀彿 # 锛� & 璇峰垹闄わ紒");
}
// if (!StringUtil.isNumber(importOwnerRoomDto.getLayer())) {
@@ -138,6 +146,10 @@
throw new IllegalArgumentException((roomIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
}
+ if (importOwnerRoomDto.getTel().length() > 11) {
+ throw new IllegalArgumentException((roomIndex + 1) + "琛屾墜鏈哄彿瓒呰繃11浣�,璇锋牳瀹�");
+ }
+
if (StringUtil.isEmpty(importOwnerRoomDto.getIdCard())) {
throw new IllegalArgumentException((roomIndex + 1) + "琛岃韩浠借瘉鍙蜂笉鑳戒负绌�");
}
@@ -164,13 +176,14 @@
// 鏍￠獙鎴愬憳涔嬪墠鏄惁瀛樺湪 涓氫富瑙掕壊
hasOwnerType = false;
for (int preRoomIndex = 0; preRoomIndex < roomIndex; preRoomIndex++) {
- tmpImportOwnerRoomDto = ownerRooms.get(roomIndex);
+ tmpImportOwnerRoomDto = ownerRooms.get(preRoomIndex);
if (tmpImportOwnerRoomDto.getFloorNum().equals(importOwnerRoomDto.getFloorNum())
&& tmpImportOwnerRoomDto.getUnitNum().equals(importOwnerRoomDto.getUnitNum())
&& tmpImportOwnerRoomDto.getRoomNum().equals(importOwnerRoomDto.getRoomNum())
&& OwnerDto.OWNER_TYPE_CD_OWNER.equals(tmpImportOwnerRoomDto.getOwnerTypeCd())) {
hasOwnerType = true;
+ break;
}
}
--
Gitblit v1.8.0