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/bo/SysMenuBo.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java
index 4c9babb..9090886 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.mybatis.core.domain.TreeEntity;
+import com.ruoyi.common.mybatis.core.domain.BaseEntity;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
@@ -13,13 +13,12 @@
/**
* 鑿滃崟鏉冮檺涓氬姟瀵硅薄 sys_menu
*
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class SysMenuBo extends TreeEntity<SysMenuBo> {
+public class SysMenuBo extends BaseEntity {
/**
* 鑿滃崟ID
@@ -28,6 +27,11 @@
private Long menuId;
/**
+ * 鐖惰彍鍗旾D
+ */
+ private Long parentId;
+
+ /**
* 鑿滃崟鍚嶇О
*/
@NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
--
Gitblit v1.9.3