From c4ef8701eff9deda7ec2df7f3daf78f256b38ce4 Mon Sep 17 00:00:00 2001
From: chenbowen <you@example.com>
Date: Wed, 28 Jan 2026 14:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E9=99=90=E5=88=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=97=B6=E8=B4=A6=E5=8F=B7=E6=A0=BC=E5=BC=8F=E4=B8=BA?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E4=BB=A5=E5=8F=8A=E5=AD=97=E6=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/user/vo/user/UserSaveReqVO.java       | 7 +++++--
 .../plat/module/system/service/dept/DeptServiceImpl.java   | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
index 842ee71c..7d11c31f 100644
--- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
+++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
@@ -10,7 +10,10 @@ import com.zt.plat.module.system.framework.operatelog.core.DeptParseFunction;
 import com.zt.plat.module.system.framework.operatelog.core.PostParseFunction;
 import com.zt.plat.module.system.framework.operatelog.core.SexParseFunction;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -28,7 +31,7 @@ public class UserSaveReqVO {
 
     @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "zt")
     @NotBlank(message = "用户账号不能为空")
-    @Pattern(regexp = "^[a-zA-Z0-9]+$", message = "用户账号由 数字、字母 组成")
+//    @Pattern(regexp = "^[a-zA-Z0-9]+$", message = "用户账号由 数字、字母 组成")
     @Size(min = 1, max = 30, message = "用户账号长度为 1-30 个字符")
     @DiffLogField(name = "用户账号")
     private String username;
diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java
index 52d15ac5..81fc35bf 100644
--- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java
+++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java
@@ -16,13 +16,12 @@ import com.zt.plat.module.system.dal.dataobject.dept.DeptDO;
 import com.zt.plat.module.system.dal.dataobject.userdept.UserDeptDO;
 import com.zt.plat.module.system.dal.mysql.dept.DeptMapper;
 import com.zt.plat.module.system.dal.mysql.userdept.UserDeptMapper;
-import com.zt.plat.module.system.service.dept.DeptExternalCodeService;
 import com.zt.plat.module.system.dal.redis.RedisKeyConstants;
 import com.zt.plat.module.system.enums.dept.DeptSourceEnum;
 import com.zt.plat.module.system.service.permission.PermissionService;
-import org.apache.seata.spring.annotation.GlobalTransactional;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.seata.spring.annotation.GlobalTransactional;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -762,6 +761,7 @@ public class DeptServiceImpl implements DeptService {
         return deptIds;
     }
 
+    @DataPermission(enable = false)
     private Long resolveNearestCompanyId(Long deptId, Map<Long, DeptDO> deptCache) {
         DeptDO current = loadDept(deptId, deptCache);
         while (current != null) {