获取租户列表增加手机号过滤

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java

@@ -140,4 +140,12 @@ public interface RemoteUserService {
      * @return 用户ids
      */
     List<Long> selectUserIdsByRoleIds(List<Long> roleIds);
+
+    /**
+     * 根据手机号查询租户id集合
+     *
+     * @param phone 手机号
+     * @return 租户id集合
+     */
+    List<String> selectTenantIdsByPhone(String phone);
 }

ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java

@@ -31,10 +31,7 @@ import org.dromara.common.social.config.properties.SocialProperties;
 import org.dromara.common.social.utils.SocialUtils;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.resource.api.RemoteMessageService;
-import org.dromara.system.api.RemoteClientService;
-import org.dromara.system.api.RemoteConfigService;
-import org.dromara.system.api.RemoteSocialService;
-import org.dromara.system.api.RemoteTenantService;
+import org.dromara.system.api.*;
 import org.dromara.system.api.domain.vo.RemoteClientVo;
 import org.dromara.system.api.domain.vo.RemoteTenantVo;
 import org.springframework.web.bind.annotation.*;
@@ -71,6 +68,9 @@ public class TokenController {
     private final RemoteSocialService remoteSocialService;
     @DubboReference(stub = "true")
     private final RemoteMessageService remoteMessageService;
+    @DubboReference
+    private final RemoteUserService remoteUserService;
+
 
     /**
      * 登录方法
@@ -194,7 +194,7 @@ public class TokenController {
      * @return 租户列表
      */
     @GetMapping("/tenant/list")
-    public R<LoginTenantVo> tenantList(HttpServletRequest request) throws Exception {
+    public R<LoginTenantVo> tenantList(HttpServletRequest request, @RequestParam(value = "phone", required = false) String phone) throws Exception {
         // 返回对象
         LoginTenantVo result = new LoginTenantVo();
         boolean enable = TenantHelper.isEnable();
@@ -204,7 +204,14 @@ public class TokenController {
             return R.ok(result);
         }
 
-        List<RemoteTenantVo> tenantList = remoteTenantService.queryList();
+        List<RemoteTenantVo> tenantList = StreamUtils.filter(remoteTenantService.queryList(), vo -> Boolean.TRUE.equals(vo.getShow()));
+
+        //通过手机号过滤
+        if (StringUtils.isNotEmpty(phone)){
+            List<String> tenantIds = remoteUserService.selectTenantIdsByPhone(phone);
+            tenantList = StreamUtils.filter(tenantList, vo -> tenantIds.contains(vo.getTenantId()));
+        }
+
         List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class);
         try {
             // 如果只超管返回所有租户

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java

@@ -34,6 +34,7 @@ import org.dromara.system.service.*;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户服务
@@ -333,4 +334,15 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return userService.selectUserIdsByRoleIds(roleIds);
     }
 
+    /**
+     * 通过手机号查询租户id集合
+     *
+     * @param phone 手机号
+     * @return 租户id集合
+     */
+    @Override
+    public List<String> selectTenantIdsByPhone(String phone) {
+        return userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phone))
+            .stream().map(SysUser::getTenantId).collect(Collectors.toList());
+    }
 }