From 5579f7494e1f5d1a41ff4a4b032a69f56082e305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 27 Apr 2026 06:52:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E7=A7=BB=E9=99=A4=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E5=94=AF=E4=B8=80=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E7=94=B1=E6=95=B0=E6=8D=AE=E5=BA=93=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E7=BA=A6=E6=9D=9F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 取消注册管理员时手机号唯一校验，允许同一手机号创建多个租户 - 删除代码中重复注册手机号的业务检查逻辑 - 数据库查询手机号码管理员时，强制必须传入租户ID进行多租户支持 - 修改SQL注释，明确手机管理员查询需提供租户ID - 保证手机号唯一性通过数据库唯一约束机制实现，提高数据一致性和扩展性 --- .../system/controller/MainController.java | 20 ++++--------------- .../common/system/mapper/xml/UserMapper.xml | 6 ++---- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index eaebab6..459c32e 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -754,14 +754,8 @@ public class MainController extends BaseController { if (!StrUtil.equals(code, cacheClient.get(phone, String.class))) { throw new BusinessException("验证码不正确"); } - // 注册管理员 - final UserParam param = new UserParam(); - param.setPhone(phone); - param.setTemplateId(user.getTemplateId()); - param.setIsAdmin(true); - if (userService.getAdminByPhone(param) != null) { - throw new BusinessException("该手机号码已注册"); - } + // 注册管理员（已去掉手机号唯一限制，同一手机号可创建多个租户） + // 重复注册的检查由数据库唯一约束处理 // 验证租户名称是否重复 if (StrUtil.isNotBlank(tenantName)) { @@ -924,14 +918,8 @@ public class MainController extends BaseController { if (!StrUtil.equals(code, cacheClient.get(phone, String.class)) && !StrUtil.equals(code, redisUtil.get(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS))) { throw new BusinessException("验证码不正确"); } - // 注册管理员 - final UserParam param = new UserParam(); - param.setPhone(phone); - param.setIsAdmin(true); - param.setTemplateId(user.getTemplateId()); - if (userService.getAdminByPhone(param) != null) { - throw new BusinessException("该手机号码已注册"); - } + // 注册管理员（已去掉手机号唯一限制，同一手机号可创建多个租户） + // 重复注册的检查由数据库唯一约束处理 // 验证租户名称是否重复 if (StrUtil.isNotBlank(tenantName)) { diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml index 374314a..4031414 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml @@ -316,7 +316,7 @@ WHERE user_id = #{userId} - +