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

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

Browse Source
This commit is contained in:
hewenqiang 2022-03-17 11:45:42 +08:00
parent fd5a87eedf
commit ac47375aba
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 = "字典排序") @ApiModelProperty(value = "字典排序")
@ExcelProperty(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 lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
/** /**
@ -62,8 +63,8 @@ public class SysRole extends BaseEntity {
*/ */
@ApiModelProperty(value = "角色排序") @ApiModelProperty(value = "角色排序")
@ExcelProperty(value = "角色排序") @ExcelProperty(value = "角色排序")
@NotBlank(message = "显示顺序不能为空") @NotNull(message = "显示顺序不能为空")
private String roleSort; private Integer roleSort;
/** /**
* 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） * 数据范围（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 lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
/** /**
@ -60,8 +61,8 @@ public class SysPost extends BaseEntity {
*/ */
@ApiModelProperty(value = "岗位排序") @ApiModelProperty(value = "岗位排序")
@ExcelProperty(value = "岗位排序") @ExcelProperty(value = "岗位排序")
@NotBlank(message = "显示顺序不能为空") @NotNull(message = "显示顺序不能为空")
private String postSort; private Integer postSort;
/** /**
* 状态（0正常 1停用） * 状态（0正常 1停用）