From afe087b97eeee566de47822e2586b1ed46b1d586 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 14 Jun 2022 14:24:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E7=A4=BE=E5=8C=BA=E8=87=AA?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E8=81=94=E7=B3=BB=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E6=A0=BC=E5=BC=8F=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcCommunitySelfOrganizationServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
index 38b22b0666..28c02a1b75 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
@@ -161,11 +161,11 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
     @Override
     public void addCommunitySelfOrganization(TokenDto tokenDto, AddCommunitySelfOrganizationFormDTO formDTO) {
         String customerId = tokenDto.getCustomerId();
-        boolean mobile = PhoneValidatorUtils.isMobile(formDTO.getPrincipalPhone());
+        /*boolean mobile = PhoneValidatorUtils.isMobile(formDTO.getPrincipalPhone());
         boolean tel = PhoneValidatorUtils.isTel(formDTO.getPrincipalPhone());
         if (!mobile && !tel){
             throw new EpmetException(EpmetErrorCode.CHECK_PHONE_ERROR.getCode());
-        }
+        }*/
         LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> l = new LambdaQueryWrapper<>();
         l.eq(IcCommunitySelfOrganizationEntity::getOrganizationName,formDTO.getOrganizationName())
                 .eq(IcCommunitySelfOrganizationEntity::getCustomerId,customerId)
@@ -246,11 +246,11 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void editCommunitySelfOrganization(TokenDto tokenDto, EditCommunitySelfOrganizationFormDTO formDTO) {
-        boolean m = PhoneValidatorUtils.isMobile(formDTO.getPrincipalPhone());
+        /*boolean m = PhoneValidatorUtils.isMobile(formDTO.getPrincipalPhone());
         boolean t = PhoneValidatorUtils.isTel(formDTO.getPrincipalPhone());
         if (!m && !t){
             throw new EpmetException(EpmetErrorCode.CHECK_PHONE_ERROR.getCode());
-        }
+        }*/
         LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> l = new LambdaQueryWrapper<>();
         l.eq(IcCommunitySelfOrganizationEntity::getOrganizationName,formDTO.getOrganizationName())
                 .eq(IcCommunitySelfOrganizationEntity::getCustomerId,tokenDto.getCustomerId())
@@ -586,7 +586,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     AtomicReference<Boolean> bl = new AtomicReference<>(false);
                     StringBuffer msg = new StringBuffer("");
                     if (CollectionUtils.isNotEmpty(l.getPersons())){
-                        l.getPersons().forEach(p -> {
+                        /*l.getPersons().forEach(p -> {
                             boolean m = PhoneValidatorUtils.isMobile(p.getPersonPhone());
                             boolean t = PhoneValidatorUtils.isTel(p.getPersonPhone());
                             if (!m && !t){
@@ -596,7 +596,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                                 return;
                                 //throw new EpmetException(EpmetErrorCode.CHECK_PHONE_ERROR.getCode());
                             }
-                        });
+                        });*/
                         persons = ConvertUtils.sourceToTarget(l.getPersons(), IcCommunitySelfOrganizationPersonnelEntity.class);
                         Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupByPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone));
                         List<String> phones = new ArrayList<>();