From c82bde97920aefc0a4f6eed6eadce9faa0882b2f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 三月 2023 23:41:16 +0800
Subject: [PATCH] fix 修复 关闭租户后 插入数据报无租户ID问题 使用默认值兼容
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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 0ade3b3..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.core.web.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,16 +30,18 @@
private Long deptId;
/**
+ * 鐖堕儴闂↖D
+ */
+ private Long parentId;
+
+ /**
* 閮ㄩ棬鍚嶇О
*/
- @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String deptName;
/**
* 鏄剧ず椤哄簭
*/
- @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private Integer orderNum;
/**
@@ -54,14 +52,11 @@
/**
* 鑱旂郴鐢佃瘽
*/
- @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String phone;
/**
* 閭
*/
- @Email(message = "閭鏍煎紡涓嶆纭�")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String email;
/**
--
Gitblit v1.9.3