Revert "支持角色父子继承，允许子角色单独调整自己有的权限"

sql/dm/用户租户关系表.sql

@@ -1,32 +0,0 @@
--- 用户-租户关系表
-create table "RUOYI-VUE-PRO".SYSTEM_USER_TENANT
-(
-    ID          BIGINT not null,
-    USER_ID     BIGINT not null,
-    TENANT_ID   BIGINT not null,
-    CREATOR     VARCHAR(256) default '',
-    CREATE_TIME TIMESTAMP default CURRENT_TIMESTAMP not null,
-    UPDATER     VARCHAR(256) default '',
-    UPDATE_TIME TIMESTAMP default CURRENT_TIMESTAMP not null,
-    DELETED     TINYINT default 0 not null
-);
-
-comment on table "RUOYI-VUE-PRO".SYSTEM_USER_TENANT is '用户-租户关系表';
-comment on column "RUOYI-VUE-PRO".SYSTEM_USER_TENANT.ID is '主键ID';
-comment on column "RUOYI-VUE-PRO".SYSTEM_USER_TENANT.USER_ID is '用户ID';
-comment on column "RUOYI-VUE-PRO".SYSTEM_USER_TENANT.TENANT_ID is '租户ID';
-comment on column "RUOYI-VUE-PRO".SYSTEM_USER_TENANT.CREATOR is '创建者';
-comment on column "RUOYI-VUE-PRO".SYSTEM_USER_TENANT.CREATE_TIME is '创建时间';
-comment on column "RUOYI-VUE-PRO".SYSTEM_USER_TENANT.UPDATER is '更新者';
-comment on column "RUOYI-VUE-PRO".SYSTEM_USER_TENANT.UPDATE_TIME is '更新时间';
-comment on column "RUOYI-VUE-PRO".SYSTEM_USER_TENANT.DELETED is '是否删除';
-
-create unique index "RUOYI-VUE-PRO".IDX_SYSTEM_USER_TENANT_ID
-    on "RUOYI-VUE-PRO".SYSTEM_USER_TENANT (ID);
-
-create unique index "RUOYI-VUE-PRO".IDX_SYSTEM_USER_TENANT_UNIQUE
-    on "RUOYI-VUE-PRO".SYSTEM_USER_TENANT (USER_ID, TENANT_ID);
-
-alter table "RUOYI-VUE-PRO".SYSTEM_USER_TENANT
-    add constraint PK_SYSTEM_USER_TENANT_ID
-        primary key (ID);

sql/dm/组织机构添加是否租户字段.sql

@@ -1,6 +0,0 @@
-alter table "RUOYI-VUE-PRO".SYSTEM_DEPT
-    add IS_TENANT TINYINT default false not null;
-
-comment
-on column "RUOYI-VUE-PRO".SYSTEM_DEPT.IS_TENANT is '组织机构是否为租户';
-

sql/dm/角色权限剔除表.sql

@@ -34,3 +34,6 @@ alter table "RUOYI-VUE-PRO".SYSTEM_ROLE_MENU_EXCLUSION
 
 alter table "RUOYI-VUE-PRO".SYSTEM_ROLE
     add PARENT_ID BIGINT default 0 not null;
+
+alter table "RUOYI-VUE-PRO".SYSTEM_ROLE
+    add PARENT_ID BIGINT default 0 not null;

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginRespVO.java

@@ -8,6 +8,9 @@ import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
+/**
+ * @author chenbowen
+ */
 @Schema(description = "管理后台 - 登录 Response VO")
 @Data
 @NoArgsConstructor
@@ -27,4 +30,6 @@ public class AuthLoginRespVO {
     @Schema(description = "过期时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime expiresTime;
 
+    @Schema(description = "租户编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long tenantId;
 }

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java

@@ -39,9 +39,6 @@ public class DeptRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 
-    @Schema(description = "组织机构是否租户", example = "true")
-    private Boolean isTenant = false;
-
     @Schema(description = "租户编号", example = "1024")
     private Long tenantId;
 

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java

@@ -48,9 +48,6 @@ public class DeptSaveReqVO {
     @InEnum(value = CommonStatusEnum.class, message = "修改状态必须是 {value}")
     private Integer status;
 
-    @Schema(description = "组织机构是否租户", example = "true")
-    private Boolean isTenant = false;
-
     @Schema(description = "租户编号", example = "1024")
     private Long tenantId;
 

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java

@@ -10,6 +10,11 @@ import cn.iocoder.yudao.module.system.service.tenant.TenantService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Set;
 

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/usertenant/vo/UserTenantPageReqVO.java

@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.usertenant.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 用户-租户关系分页 Request VO")
-@Data
-public class UserTenantPageReqVO extends PageParam {
-
-    @Schema(description = "用户ID", example = "32426")
-    private Long userId;
-
-    @Schema(description = "租户ID", example = "30027")
-    private Long tenantId;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/usertenant/vo/UserTenantRespVO.java

@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.usertenant.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 用户-租户关系 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class UserTenantRespVO {
-
-    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26967")
-    @ExcelProperty("主键ID")
-    private Long id;
-
-    @Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32426")
-    @ExcelProperty("用户ID")
-    private Long userId;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}