|
|
@ -485,7 +485,7 @@ public class HrmImportProcessE9 extends BaseBean {
|
|
|
|
} else if ("".equals(vo.getEmail().trim())) {
|
|
|
|
} else if ("".equals(vo.getEmail().trim())) {
|
|
|
|
hrm.setEmail("");
|
|
|
|
hrm.setEmail("");
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
Pattern pattern = Pattern.compile("^([a-zA-Z0-9_\\-]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(?)$");
|
|
|
|
Pattern pattern = Pattern.compile("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(?)$");
|
|
|
|
Matcher matcher = pattern.matcher(vo.getEmail());
|
|
|
|
Matcher matcher = pattern.matcher(vo.getEmail());
|
|
|
|
if (!matcher.matches()) {
|
|
|
|
if (!matcher.matches()) {
|
|
|
|
resultList.add(createLog(vo, "创建", "失败", SystemEnv.getHtmlLabelName(24570, userlanguage)));
|
|
|
|
resultList.add(createLog(vo, "创建", "失败", SystemEnv.getHtmlLabelName(24570, userlanguage)));
|
|
|
@ -1048,7 +1048,7 @@ public class HrmImportProcessE9 extends BaseBean {
|
|
|
|
} else if ("".equals(vo.getEmail().trim())) {
|
|
|
|
} else if ("".equals(vo.getEmail().trim())) {
|
|
|
|
hrm.setEmail("");
|
|
|
|
hrm.setEmail("");
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
Pattern pattern = Pattern.compile("^([a-zA-Z0-9_\\-]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(?)$");
|
|
|
|
Pattern pattern = Pattern.compile("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(?)$");
|
|
|
|
Matcher matcher = pattern.matcher(vo.getEmail());
|
|
|
|
Matcher matcher = pattern.matcher(vo.getEmail());
|
|
|
|
if (!matcher.matches()) {
|
|
|
|
if (!matcher.matches()) {
|
|
|
|
resultList.add(createLog(vo, "更新", "失败", SystemEnv.getHtmlLabelName(24570, userlanguage)));
|
|
|
|
resultList.add(createLog(vo, "更新", "失败", SystemEnv.getHtmlLabelName(24570, userlanguage)));
|
|
|
|