diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 446c3fe..382bbb5 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -3228,7 +3228,8 @@ public class UsersController extends BaseController { String dept = Tools.isEmpty(lpd.get("var0")) ? "" : Tools.excelHandle(lpd.get("var0"));//部门 String postName = Tools.isEmpty(lpd.get("var1")) ? "" : lpd.get("var1").toString();//岗位 - String userName = Tools.isEmpty(lpd.get("var2")) ? "" : lpd.get("var2").toString();//手机号 + String userName = Tools.isEmpty(lpd.get("var4")) ? "" : lpd.get("var4").toString();//身份证号 + String phone = Tools.isEmpty(lpd.get("var2")) ? "" : lpd.get("var2").toString();//手机号 Pattern patternPhone = Pattern.compile(RegexPatterns.PHONE_REGEX); Matcher matcher = patternPhone.matcher(lpd.getString("var2")); if (!matcher.matches()) { @@ -3279,7 +3280,7 @@ public class UsersController extends BaseController { if (hasUserNameChongfu.containsKey(userName)) { errorStr.append("第" + number + "行,"); - errorStr.append("手机号重复,请重新确认数据;\n"); + errorStr.append("身份证号重复,请重新确认数据;\n"); continue; } @@ -3301,7 +3302,7 @@ public class UsersController extends BaseController { user.put("SKIN", "pcoded-navbar navbar-image-3,navbar pcoded-header navbar-expand-lg navbar-light header-dark,"); user.put("EMAIL", ""); user.put("NUMBER", ""); - user.put("PHONE", ""); + user.put("PHONE", phone); user.put("ROLE_IDS", ""); user.put("DEPARTMENT_ID", departId); user.put("POST_ID", postId);