From ba8471b1ec547ab93600a9f5a4aa3051ea2bd63e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 14 Jun 2022 10:52:34 +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

---
 ...cCommunitySelfOrganizationServiceImpl.java | 21 +++++++++++++------
 1 file changed, 15 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 8546add25e..38b22b0666 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
@@ -200,13 +200,16 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         baseDao.insert(orgEntity);
         if(CollectionUtils.isNotEmpty(formDTO.getOrganizationPersonnel())){
             // 号码校验
-            formDTO.getOrganizationPersonnel().forEach(p -> {
+            /**
+             * 2022-06-14 需求变动 去掉号码校验
+             */
+            /*formDTO.getOrganizationPersonnel().forEach(p -> {
                 boolean m = PhoneValidatorUtils.isMobile(p.getPersonPhone());
                 boolean t = PhoneValidatorUtils.isTel(p.getPersonPhone());
                 if (!m && !t){
                     throw new EpmetException(EpmetErrorCode.CHECK_PHONE_ERROR.getCode());
                 }
-            });
+            });*/
             List<IcCommunitySelfOrganizationPersonnelEntity> persons = ConvertUtils.sourceToTarget(formDTO.getOrganizationPersonnel(), IcCommunitySelfOrganizationPersonnelEntity.class);
             Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone));
             List<String> phones = new ArrayList<>();
@@ -263,13 +266,16 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         baseDao.updateCommunitySelfOrganization(e);
         personnelService.deleteByOrgId(formDTO.getOrgId());
         if (CollectionUtils.isNotEmpty(formDTO.getOrganizationPersonnel())){
-            formDTO.getOrganizationPersonnel().forEach(p -> {
+            /**
+             * 2022-06-14 需求变动 去掉号码校验
+             */
+            /*formDTO.getOrganizationPersonnel().forEach(p -> {
                 boolean mobile = PhoneValidatorUtils.isMobile(p.getPersonPhone());
                 boolean tel = PhoneValidatorUtils.isTel(p.getPersonPhone());
                 if (!mobile && !tel){
                     throw new EpmetException(EpmetErrorCode.CHECK_PHONE_ERROR.getCode());
                 }
-            });
+            });*/
             List<IcCommunitySelfOrganizationPersonnelEntity> persons = ConvertUtils.sourceToTarget(formDTO.getOrganizationPersonnel(), IcCommunitySelfOrganizationPersonnelEntity.class);
             Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone));
             List<String> phones = new ArrayList<>();
@@ -540,13 +546,16 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                         }
                     });
                     //手机号不合规
-                    boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone());
+                    /**
+                     * 2022-06-14 需求变动 去掉号码校验
+                     */
+                    /*boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone());
                     boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone());
                     if (!m && !t){
                         errMsg.append("手机号码不合法;");
                         bl.set(true);
                         log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName());
-                    }
+                    }*/
                     if(bl.get()){
                         excel = new CommunitySelfOrgImportExcel();
                         //excel.setAgencyName(obj.getOrganizationName());