From f9f7f5e141ccd58e17689b7d466c68fe91a9af45 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Wed, 24 May 2023 09:44:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/sys/service/UserEOServiceImpl.java | 6 ++++-- .../main/resources/template/用户导入模板.xlsx | Bin 8967 -> 8982 bytes 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 3d369b5..f97f5da 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -584,7 +584,9 @@ public class UserEOServiceImpl implements IUserEoService { throw new AdcDaBaseException("第"+(i+1)+"行"+"用户名不符合规则"); } if (StringUtils.isNotBlank(userImportVO.getEmail())) { -// if (!(userImportVO.getEmail().matches("^[\\w-.]+@[a-z\\d-]+(\\.[a-z\\d-]+)*\\.[a-z\\d]{2,6}$/i"))) { + if (userImportVO.getEmail().length() > 50 ) { + throw new AdcDaBaseException("第"+(i+1)+"行"+"邮箱长度不能超过50"); + } if (!(userImportVO.getEmail().matches("^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$"))) { throw new AdcDaBaseException("第"+(i+1)+"行"+"邮箱不符合规则!"); } @@ -604,7 +606,7 @@ public class UserEOServiceImpl implements IUserEoService { throw new AdcDaBaseException("第"+(i+1)+"行"+s+"部门不存在"); }else { userImportVO.setOrgId(StringUtils.isEmpty(userImportVO.getOrgId()) ? orgEO.getId() - : "," + orgEO.getId()); + :userImportVO.getOrgId() + "," + orgEO.getId()); } } } diff --git a/adc-da-sys/src/main/resources/template/用户导入模板.xlsx b/adc-da-sys/src/main/resources/template/用户导入模板.xlsx index a7cc340a47087f3c6078805fdf18be81cc1da4d3..07dfe36516db88628378e59c63d20267d330f1e7 100644 GIT binary patch delta 3810 zcmV<84ju7_MwUjfm;nUCTE)kcoBTUH!^LvRCjoP`x!11D)iD-e=5_W$$d&&cWcu`GfIFji_cLQ#*P02J3k zs`&_A%_iXx1=cYoSfLe+&$ux&!CSF&KU&!tm&;{unKUtc{s`Yp&n}x$L#gUraX?ur zIOPVI(!yD7xdd^%%0Awo+LPknqUSf` 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 Y2@(h*IIIEy07H|+B0UEA9smFU0QI~(p#T5? delta 3812 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 aB3=n7)#Z|)0ssIilhYzS2I?LF00013J2qed