fix:update user/tenant

Author: msslulu

base/src/main/java/com/tinyengine/it/common/exception/ExceptionEnum.java

@@ -322,11 +322,16 @@ public enum ExceptionEnum implements IBaseError {
      * Cm 339 exception enum.
      */
     CM339("CM339", "token检验失败，请重新登录"),
+
     /**
      * Cm 340 exception enum.
      */
-    CM340("CM340", "请求资源不存在");
+    CM340("CM340", "请求资源不存在"),
 
+    /**
+     * Cm 341 exception enum.
+     */
+    CM341("CM341", "组织在当前用户组织列表中匹配不到");
     /**
      * 错误码
      */

base/src/main/java/com/tinyengine/it/login/controller/LoginController.java

@@ -91,8 +91,6 @@ public class LoginController {
 
     @Autowired
     LoginUserContext loginUserContext;
-    @Autowired
-    private  TenantService tenantService;
 
     /**
      * 注册
@@ -241,12 +239,12 @@ public Result<ValidationResult> validateToken(@RequestParam String token) {
     @SystemControllerLog(description = "设置当前组织")
     @GetMapping("/user/tenant")
     public Result<SSOTicket> setTenant(@RequestParam Integer tenantId) {
+        List<Tenant> tenants = authUsersUnitsRolesMapper.queryAllTenantByUserId(Integer.valueOf(loginUserContext.getLoginUserId()));
+
         if (tenantId == null) {
             return Result.failed(ExceptionEnum.CM320);
         }
 
-        List<Tenant> tenants = tenantService.findTenantByTenantId(tenantId);
-
         if (tenants == null || tenants.isEmpty()) {
             return Result.failed(ExceptionEnum.CM337);
         }
@@ -264,7 +262,7 @@ public Result<SSOTicket> setTenant(@RequestParam Integer tenantId) {
         }
 
         if (!found) {
-            return Result.failed(ExceptionEnum.CM337);
+            return Result.failed(ExceptionEnum.CM341);
         }
 
         // 通过 RequestContextHolder 获取请求

base/src/main/java/com/tinyengine/it/service/platform/TenantService.java

@@ -46,14 +46,6 @@ public interface TenantService extends IService<Tenant> {
      */
     List<Tenant> findTenantByCondition(Tenant tenant);
 
-    /**
-     * 根据条件查询表t_tenant信息
-     *
-     * @param tenantId the tenantId
-     * @return the list
-     */
-    List<Tenant> findTenantByTenantId(Integer tenantId);
-
     /**
      * 根据主键id删除t_tenant数据
      *

base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java

@@ -81,17 +81,6 @@ public List<Tenant> findTenantByCondition(Tenant tenant) {
         return baseMapper.queryTenantByCondition(tenant);
     }
 
-    /**
-     * 根据条件查询表t_tenant信息
-     *
-     * @param tenantId the tenantId
-     * @return the list
-     */
-    @Override
-    public List<Tenant> findTenantByTenantId(Integer tenantId) {
-        return baseMapper.selectList(new QueryWrapper<Tenant>().eq("id", tenantId));
-    }
-
     /**
      * 根据主键id删除表t_tenant数据
      *