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 { + /** + * 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 persons = ConvertUtils.sourceToTarget(formDTO.getOrganizationPersonnel(), IcCommunitySelfOrganizationPersonnelEntity.class); Map> groupPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)); List phones = new ArrayList<>(); @@ -263,13 +266,16 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl { + /** + * 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 persons = ConvertUtils.sourceToTarget(formDTO.getOrganizationPersonnel(), IcCommunitySelfOrganizationPersonnelEntity.class); Map> groupPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)); List phones = new ArrayList<>(); @@ -540,13 +546,16 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl