From e4a31989983da3182a945b2f0bdbf6aeeb0454db Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 10 四月 2023 17:22:45 +0800
Subject: [PATCH] optimize owner updata log

---
 springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
index 981af9f..9b6ee28 100644
--- a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
@@ -138,6 +138,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 +168,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(importOwnerRoomDto.getOwnerTypeCd())) {
+                        && OwnerDto.OWNER_TYPE_CD_OWNER.equals(tmpImportOwnerRoomDto.getOwnerTypeCd())) {
                     hasOwnerType = true;
+                    break;
                 }
             }
 

--
Gitblit v1.8.0