From 59ff173699d95f3c7bc9b7d798cb75827dbf01fa Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 28 Oct 2021 10:07:00 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E7=BB=84=E7=BB=87=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysDepartController.java | 2 +- .../main/java/com/jero/modules/system/model/SysDepartExcel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 7e7a03e5..af68e94c 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -453,7 +453,7 @@ public class SysDepartController { LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(SysDepart::getOrgCode,sysDepart.getOrgCode()); if (sysDepartService.count(wrapper1) > 0) { - errorMessage.add("第 " + lineNumber + " 行：部门编码已经存在"); + errorMessage.add("第 " + lineNumber + " 行：机构编码已经存在"); } if (errorMessage.isEmpty()){ SysDepart sysDepart1 = new SysDepart(); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java index e02b7495..4a83c47f 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java @@ -37,7 +37,7 @@ public class SysDepartExcel { private String orgCode; /**手机号*/ @Excel(name="手机号",width=15,orderNum = "5") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") + @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误") private String mobile; /**传真*/ private String fax;