admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!156 修复角色、岗位、字典数据在PostgreSQL执行插入或者更新SQL报错问题，修改对应实体类的排序属性为Integer类型。

Browse Source 
Merge pull request !156 from KonBAI/sort_type
This commit is contained in:
疯狂的狮子Li 2022-03-17 04:32:51 +00:00 committed by Gitee
commit a16ae7dadc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
View File

@ -42,7 +42,7 @@ public class SysDictData extends BaseEntity {
*/
@ApiModelProperty(value = "字典排序")
@ExcelProperty(value = "字典排序")
private Long dictSort;
private Integer dictSort;
/**
* 字典标签

5
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
View File

@ -16,6 +16,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
@ -62,8 +63,8 @@ public class SysRole extends BaseEntity {
*/
@ApiModelProperty(value = "角色排序")
@ExcelProperty(value = "角色排序")
@NotBlank(message = "显示顺序不能为空")
private String roleSort;
@NotNull(message = "显示顺序不能为空")
private Integer roleSort;
/**
* 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）

5
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
View File

@ -14,6 +14,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
@ -60,8 +61,8 @@ public class SysPost extends BaseEntity {
*/
@ApiModelProperty(value = "岗位排序")
@ExcelProperty(value = "岗位排序")
@NotBlank(message = "显示顺序不能为空")
private String postSort;
@NotNull(message = "显示顺序不能为空")
private Integer postSort;
/**
* 状态（0正常 1停用）