From 0ec6fbd34ca4633a415e17ee50450f12e815a4aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 三月 2023 23:29:05 +0800
Subject: [PATCH] fix 修复 管理租户被修改导致无法登录超管账号问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java
index cdd7aae..96a1f28 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java
@@ -1,18 +1,10 @@
package com.ruoyi.system.domain;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.mybatis.core.domain.BaseEntity;
-import com.ruoyi.common.excel.annotation.ExcelDictFormat;
-import com.ruoyi.common.excel.convert.ExcelDictConvert;
+import com.ruoyi.common.tenant.core.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
/**
* 瀛楀吀绫诲瀷琛� sys_dict_type
@@ -23,38 +15,27 @@
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_dict_type")
-@ExcelIgnoreUnannotated
-public class SysDictType extends BaseEntity {
+public class SysDictType extends TenantEntity {
/**
* 瀛楀吀涓婚敭
*/
- @ExcelProperty(value = "瀛楀吀涓婚敭")
@TableId(value = "dict_id")
private Long dictId;
/**
* 瀛楀吀鍚嶇О
*/
- @ExcelProperty(value = "瀛楀吀鍚嶇О")
- @NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String dictName;
/**
* 瀛楀吀绫诲瀷
*/
- @ExcelProperty(value = "瀛楀吀绫诲瀷")
- @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
- @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "瀛楀吀绫诲瀷蹇呴』浠ュ瓧姣嶅紑澶达紝涓斿彧鑳戒负锛堝皬鍐欏瓧姣嶏紝鏁板瓧锛屼笅婊戠嚎锛�")
private String dictType;
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
/**
--
Gitblit v1.9.3