From c3c45e23936e669153b07f66a04d48c32544b488 Mon Sep 17 00:00:00 2001
From: 10396 <1039655633@qq.com>
Date: Mon, 14 Jul 2025 17:59:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(system):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=92=8C=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 userName 变
---
 .../java/com/zcloud/controller/system/UsersController.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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);