feat(system): 支持分页查询租户时根据all参数控制范围

- 新增TenantParam中的all字段用于控制是否查询全部租户
- page接口根据all参数判断是否自动设置当前登录用户userId作为过滤条件
- 保持mask参数逻辑不变，支持脱敏控制
- 改进分页查询功能，增强查询灵活性和权限控制

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)) {
@@ -795,11 +789,12 @@ public class MainController extends BaseController {
     company.setShortName(tenantName);
     company.setTenantId(tenant.getTenantId());
     company.setTemplateId(user.getTemplateId());
-    tenantService.initialization(company);
+    final Company addCompany = tenantService.initialization(company);
     final UserParam userParam = new UserParam();
     userParam.setIsAdmin(true);
     userParam.setPhone(phone);
     userParam.setTemplateId(user.getTemplateId());
+    userParam.setTenantId(addCompany.getTenantId());  // 使用新创建的租户ID
     final User adminByPhone = userService.getAdminByPhone(userParam);
 
     // 设置过期时间
@@ -869,7 +864,9 @@ public class MainController extends BaseController {
   public ApiResult<LoginResult> superAdminRegister(@RequestBody User user) {
     // 验证签名
     String tenantName = user.getCompanyName();     // 应用名称
-    String phone = user.getPhone();                // 手机号码
+    // 自动使用当前登录用户的手机号
+    User loginUser = getLoginUser();
+    String phone = loginUser != null ? loginUser.getPhone() : user.getPhone();
     String password = user.getPassword();          // 密码
     String code = user.getCode();                  // 短信验证码
     String email = user.getEmail();                // 邮箱
@@ -922,14 +919,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)) {
@@ -951,6 +942,7 @@ public class MainController extends BaseController {
     tenant.setPhone(phone);
     tenant.setTenantCode(CommonUtil.randomUUID16());
     tenant.setSortNumber(100);
+    tenant.setUserId(getLoginUserId());  // 保存当前登录用户ID
     tenantService.save(tenant);
 
     // 租户初始化
@@ -982,6 +974,7 @@ public class MainController extends BaseController {
       userParam1.setIsAdmin(true);
       userParam1.setPhone(phone);
       userParam1.setTemplateId(user.getTemplateId());
+      userParam1.setTenantId(addCompany.getTenantId());  // 使用新创建的租户ID
       final User adminByPhone = userService.getAdminByPhone(userParam1);
 
       // 设置过期时间

src/main/java/com/gxwebsoft/common/system/controller/TenantController.java

@@ -53,7 +53,25 @@ public class TenantController extends BaseController {
   @Operation(summary = "分页查询租户")
   @GetMapping("/page")
   public ApiResult<PageResult<Tenant>> page(TenantParam param) {
-    return success(tenantService.pageRel(param));
+    // 如果传了 all=true，查询全部租户；否则自动用当前登录用户的 userId
+    if (param.getAll() == null || !param.getAll()) {
+      if (param.getUserId() == null) {
+        final User loginUser = getLoginUser();
+        if (loginUser != null && loginUser.getUserId() != null) {
+          param.setUserId(loginUser.getUserId());
+        }
+      }
+    }
+    PageResult<Tenant> result = tenantService.pageRel(param);
+    // 如果传入 mask=false，设置不脱敏
+    if (param.getMask() != null && !param.getMask()) {
+      if (result.getList() != null) {
+        for (Tenant tenant : result.getList()) {
+          tenant.setPhoneMasked(false);
+        }
+      }
+    }
+    return success(result);
   }
 
   @PreAuthorize("hasAuthority('sys:tenant:list')")

src/main/java/com/gxwebsoft/common/system/entity/Tenant.java

@@ -96,6 +96,10 @@ public class Tenant implements Serializable {
   @TableField(exist = false)
   private Object date;
 
+  @Schema(description = "用户名")
+  @TableField(exist = false)
+  private String username;
+
   @Schema(description = "手机号码")
   @TableField(exist = false)
   private String phone;
@@ -112,7 +116,21 @@ public class Tenant implements Serializable {
   @TableField(exist = false)
   private String freeDomain;
 
+  /**
+   * 是否脱敏手机号，默认true脱敏
+   */
+  @TableField(exist = false)
+  @Schema(description = "手机号是否脱敏，默认true")
+  private boolean phoneMasked = true;
+
   public String getPhone(){
+    if (phoneMasked) {
       return DesensitizedUtil.mobilePhone(this.phone);
     }
+    return this.phone;
+  }
+
+  public void setPhoneMasked(boolean masked) {
+    this.phoneMasked = masked;
+  }
 }

src/main/java/com/gxwebsoft/common/system/entity/User.java

@@ -197,7 +197,6 @@ public class User implements UserDetails {
     private Integer isOrganizationAdmin;
 
     @Schema(description = "是否超级管理员")
-    @TableField(exist = false)
     private Boolean isSuperAdmin;
 
     @Schema(description = "租户管理员ID")

src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml

@@ -4,9 +4,11 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,b.company_name,b.company_logo as logo,b.admin_url,b.domain,b.free_domain
+        SELECT a.*,b.company_name,b.company_logo as logo,b.admin_url,b.domain,b.free_domain,
+               u.phone,u.username
         FROM sys_tenant a
         LEFT JOIN sys_company b ON a.tenant_id = b.tenant_id
+        LEFT JOIN gxwebsoft_core.sys_user u ON u.tenant_id = a.tenant_id AND u.is_super_admin = 1 AND u.deleted = 0
         <where>
             <if test="param.tenantId != null">
                 AND a.tenant_id = #{param.tenantId}

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -316,18 +316,15 @@
     WHERE user_id = #{userId}
   </select>
 
-  <!-- 根据手机号码查询 -->
+  <!-- 根据手机号码查询（支持多租户：必须传 tenantId 才能查到对应租户的管理员） -->
   <select id="selectAdminByPhone" resultType="com.gxwebsoft.common.system.entity.User">
     SELECT a.*
     FROM sys_user a
     <where>
       AND a.deleted = 0
       AND a.phone = #{param.phone}
-      AND a.template_id = #{param.templateId}
       AND (a.username = 'superAdmin' OR a.username = 'admin' OR a.is_admin = 1)
-      <if test="param.tenantId">
       AND a.tenant_id = #{param.tenantId}
-      </if>
       LIMIT 1
     </where>
   </select>

src/main/java/com/gxwebsoft/common/system/param/TenantParam.java

@@ -1,13 +1,10 @@
 package com.gxwebsoft.common.system.param;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
 import com.gxwebsoft.common.core.web.BaseParam;
 import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -52,4 +49,11 @@ public class TenantParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer tenantId;
 
+    @Schema(description = "手机号是否脱敏，默认true")
+    @QueryField(type = QueryType.EQ)
+    private Boolean mask;
+
+    @Schema(description = "查询全部租户，true时忽略userId条件")
+    private Boolean all;
+
 }