From e7242d40110c8a157867acd2d1a1718fb640d4c5 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: 星期五, 17 二月 2023 16:02:04 +0800 Subject: [PATCH] fix 修正 SysTenantServiceImpl#deleteWithValidByIds 超管租户可以被删除的问题, 加上 id 校验 ; fix 修正 tenant/index.vue handleUpdate 租户套餐回显问题 ; --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java index eb3b1dc..efa67ff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java @@ -3,11 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.mybatis.core.domain.TreeEntity; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import com.ruoyi.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,7 +18,7 @@ @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_dept") -public class SysDept extends TreeEntity<SysDept> { +public class SysDept extends TenantEntity { @Serial private static final long serialVersionUID = 1L; @@ -34,6 +30,11 @@ private Long deptId; /** + * 鐖堕儴闂↖D + */ + private Long parentId; + + /** * 閮ㄩ棬鍚嶇О */ private String deptName; -- Gitblit v1.9.3