jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

!167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型

Browse Source 
* fix 修改 postgres sql脚本，处理角色表字段类型错误问题。
* fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
This commit is contained in:
KonBAI
2022-04-02 05:02:56 +00:00
committed by 疯狂的狮子Li
parent e6940d48e3
commit a33898c2a0
3 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,13 +78,13 @@ public class SysRole extends BaseEntity {
* 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
*/
@ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
private Integer menuCheckStrictly;
private Boolean menuCheckStrictly;
/**
* 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
*/
@ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
private Integer deptCheckStrictly;
private Boolean deptCheckStrictly;
/**
* 角色状态（0正常 1停用）
@ -136,34 +136,4 @@ public class SysRole extends BaseEntity {
public boolean isAdmin() {
return UserConstants.ADMIN_ID.equals(this.roleId);
}
public Boolean getMenuCheckStrictly() {
if (menuCheckStrictly == null) {
return null;
}
return menuCheckStrictly == 1;
}
public void setMenuCheckStrictly(Boolean menuCheckStrictly) {
if (menuCheckStrictly == null) {
this.menuCheckStrictly = null;
return;
}
this.menuCheckStrictly = menuCheckStrictly ? 1 : 0;
}
public Boolean getDeptCheckStrictly() {
if (deptCheckStrictly == null) {
return null;
}
return deptCheckStrictly == 1;
}
public void setDeptCheckStrictly(Boolean deptCheckStrictly) {
if (deptCheckStrictly == null) {
this.deptCheckStrictly = null;
return;
}
this.deptCheckStrictly = deptCheckStrictly ? 1 : 0;
}
}