From d330fbb1236bc882ab1fecd08b8de7e435055fdf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Jun 2022 12:56:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cCommunitySelfOrganizationServiceImpl.java | 27 ++++++++++-------- .../templates/self_org_import_template.xlsx | Bin 8959 -> 8998 bytes 2 files changed, 15 insertions(+), 12 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 cb063772c0..698045aa65 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 @@ -534,19 +534,19 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl { if (obj.getOrganizationName().equals(org.getOrganizationName())) { - log.warn(String.format("当前客户下的社会自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum())); - errMsg.append("客户下社会自组织名称已存在;"); + log.warn(String.format("当前客户下的社区自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum())); + errMsg.append("客户下社区自组织名称已存在;"); bl.set(true); } }); - //手机号不合规 - boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone()); - boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone()); - if (!m && !t){ - errMsg.append("手机号码不合法;"); - bl.set(true); - log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName()); - } + // //手机号不合规 + // 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()); @@ -565,12 +565,15 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl