From ac47375aba17033ace1791bdebb5f5bb7d343827 Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: 星期四, 17 三月 2022 11:45:42 +0800
Subject: [PATCH] fix 修复角色、岗位、字典数据在PostgreSQL执行插入或者更新SQL报错问题，修改对应实体类的排序属性为Integer类型。
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index 3153e41..8d91660 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -7,15 +7,16 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
@@ -27,7 +28,6 @@
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_role")
@ExcelIgnoreUnannotated
public class SysRole extends BaseEntity {
@@ -63,8 +63,8 @@
*/
@ApiModelProperty(value = "瑙掕壊鎺掑簭")
@ExcelProperty(value = "瑙掕壊鎺掑簭")
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String roleSort;
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer roleSort;
/**
* 鏁版嵁鑼冨洿锛�1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛�3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛�4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛�
@@ -78,13 +78,13 @@
* 鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級
*/
@ApiModelProperty(value = "鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級")
- private boolean menuCheckStrictly;
+ private Integer menuCheckStrictly;
/**
* 閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛�
*/
@ApiModelProperty(value = "閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛�")
- private boolean deptCheckStrictly;
+ private Integer deptCheckStrictly;
/**
* 瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
@@ -134,11 +134,7 @@
@ApiModelProperty(value = "鏄惁绠＄悊鍛�")
public boolean isAdmin() {
- return isAdmin(this.roleId);
- }
-
- public static boolean isAdmin(Long roleId) {
- return roleId != null && 1L == roleId;
+ return UserConstants.ADMIN_ID.equals(this.roleId);
}
}
--
Gitblit v1.9.3