From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java
index 94fb31e..3207bad 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java
@@ -1,10 +1,5 @@
package org.dromara.system.domain.bo;
-import org.dromara.common.core.constant.UserConstants;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.domain.SysRole;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -12,6 +7,9 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysRole;
/**
* 瑙掕壊淇℃伅涓氬姟瀵硅薄 sys_role
@@ -28,27 +26,26 @@
/**
* 瑙掕壊ID
*/
- @NotNull(message = "瑙掕壊ID涓嶈兘涓虹┖", groups = { EditGroup.class })
private Long roleId;
/**
* 瑙掕壊鍚嶇О
*/
- @NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ @NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "瑙掕壊鍚嶇О闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String roleName;
/**
* 瑙掕壊鏉冮檺瀛楃涓�
*/
- @NotBlank(message = "瑙掕壊鏉冮檺瀛楃涓蹭笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
+ @NotBlank(message = "瑙掕壊鏉冮檺瀛楃涓蹭笉鑳戒负绌�")
@Size(min = 0, max = 100, message = "鏉冮檺瀛楃闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String roleKey;
/**
* 鏄剧ず椤哄簭
*/
- @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private Integer roleSort;
/**
@@ -91,7 +88,7 @@
}
public boolean isSuperAdmin() {
- return UserConstants.SUPER_ADMIN_ID.equals(this.roleId);
+ return SystemConstants.SUPER_ADMIN_ID.equals(this.roleId);
}
}
--
Gitblit v1.9.3