新增查询租户下对应的用户列表接口

tuoheng_oidc_admin/src/main/java/com/tuoheng/constant/WateWayConstant.java

@@ -1,15 +0,0 @@
-package com.tuoheng.constant;
-
-/**
- * 航道平台接口常量类
- *
- * @Author xiaoying
- * @Date 2023/2/23 9:34
- */
-public class WateWayConstant {
-
-
-    public static final String WATEWAY_CLIENT = "tuoheng-wateway";
-
-    public static final String WATEWAY_NAME = "航道业务平台";
-}

tuoheng_oidc_admin/src/main/java/com/tuoheng/constant/WaterWayConstant.java

@@ -0,0 +1,15 @@
+package com.tuoheng.constant;
+
+/**
+ * 航道平台接口常量类
+ *
+ * @Author xiaoying
+ * @Date 2023/2/23 9:34
+ */
+public class WaterWayConstant {
+
+
+    public static final String WATERWAY_CLIENT = "tuoheng-waterway";
+
+    public static final String WATERWAY_NAME = "航道业务平台";
+}

tuoheng_oidc_admin/src/main/java/com/tuoheng/controller/UserController.java

@@ -61,4 +61,14 @@ public class UserController {
 
     }
 
+    /**
+     * 查询对应租户下的所有用户数据
+     * @param tenantId
+     * @return
+     */
+    @GetMapping("/findUserList")
+    public JsonResult findUserList(Long tenantId){
+        return clientUserSevice.findUserList(tenantId);
+    }
+
 }

tuoheng_oidc_admin/src/main/java/com/tuoheng/service/ClientUserSevice.java

@@ -48,4 +48,10 @@ public interface ClientUserSevice {
      * @return
      */
     JsonResult updateAuthorities(CreateClientUserDto createClientUserDto, LoginUser loginUser);
+    /**
+     * 查询对应租户下的所有用户数据
+     * @param tenantId
+     * @return
+     */
+    JsonResult findUserList(Long tenantId);
 }

tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/ClientUserServiceImpl.java

@@ -5,9 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.tuoheng.common.CommonConfig;
 import com.tuoheng.common.ServiceException;
 import com.tuoheng.constant.*;
 import com.tuoheng.mapper.*;
@@ -18,13 +15,11 @@ import com.tuoheng.model.po.ClientUserRolePo;
 import com.tuoheng.model.po.TenantPo;
 import com.tuoheng.model.po.UserPo;
 import com.tuoheng.model.query.TenantQuery;
-import com.tuoheng.model.request.AirportRequest;
 import com.tuoheng.model.vo.BusinessSystemVo;
 import com.tuoheng.model.vo.TenantVo;
 import com.tuoheng.service.ClientUserSevice;
 import com.tuoheng.until.JsonResult;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -223,6 +218,18 @@ public class ClientUserServiceImpl implements ClientUserSevice {
         return JsonResult.success(true);
     }
 
+    /**
+     * 查询对应租户下的所有用户数据
+     *
+     * @param tenantId
+     * @return
+     */
+    @Override
+    public JsonResult findUserList(Long tenantId) {
+        List<UserPo> userPos = clientUserMapper.selectByTenantId(tenantId);
+        return JsonResult.success(userPos);
+    }
+
     /**
      * 更新 用户/租户对应关系的系统or角色id
      *
@@ -337,8 +344,8 @@ public class ClientUserServiceImpl implements ClientUserSevice {
                 }
                 if (authoritiesPo.getAuthority().contains("wateway")) {
                     BusinessSystemVo businessSystemVo = new BusinessSystemVo();
-                    businessSystemVo.setClientId(WateWayConstant.WATEWAY_CLIENT);
-                    businessSystemVo.setName(WateWayConstant.WATEWAY_NAME);
+                    businessSystemVo.setClientId(WaterWayConstant.WATERWAY_CLIENT);
+                    businessSystemVo.setName(WaterWayConstant.WATERWAY_NAME);
                     businessSystemVoList.add(businessSystemVo);
                 }
                 if (authoritiesPo.getAuthority().contains("freeway")) {