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

update 优化 SysRole 部分字段类型 防止数据库类型映射异常

Browse Source
This commit is contained in:
疯狂的狮子li 2022-03-16 12:45:53 +08:00
parent 880b3290e8
commit 49ac180329
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,13 +77,13 @@ public class SysRole extends BaseEntity {
* 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
*/ */
@ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）") @ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
private boolean menuCheckStrictly; private Integer menuCheckStrictly;
/** /**
* 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
*/ */
@ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）") @ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
private boolean deptCheckStrictly; private Integer deptCheckStrictly;
/** /**
* 角色状态（0正常 1停用） * 角色状态（0正常 1停用）

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -85,7 +85,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
@Override @Override
public List<Long> selectDeptListByRoleId(Long roleId) { public List<Long> selectDeptListByRoleId(Long roleId) {
SysRole role = roleMapper.selectById(roleId); SysRole role = roleMapper.selectById(roleId);
return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly() == 1);
} }
/** /**

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@ -123,7 +123,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
@Override @Override
public List<Long> selectMenuListByRoleId(Long roleId) { public List<Long> selectMenuListByRoleId(Long roleId) {
SysRole role = roleMapper.selectById(roleId); SysRole role = roleMapper.selectById(roleId);
return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly() == 1);
} }
/** /**

16
ruoyi-ui/src/views/system/role/index.vue
View File

@ -187,14 +187,14 @@
<el-form-item label="菜单权限"> <el-form-item label="菜单权限">
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox> <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox> <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
<el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox> <el-checkbox v-model="form.menuCheckStrictly == 1" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
<el-tree <el-tree
class="tree-border" class="tree-border"
:data="menuOptions" :data="menuOptions"
show-checkbox show-checkbox
ref="menu" ref="menu"
node-key="id" node-key="id"
:check-strictly="!form.menuCheckStrictly" :check-strictly="!form.menuCheckStrictly == 1"
empty-text="加载中，请稍候" empty-text="加载中，请稍候"
:props="defaultProps" :props="defaultProps"
></el-tree> ></el-tree>
@ -231,7 +231,7 @@
<el-form-item label="数据权限" v-show="form.dataScope == 2"> <el-form-item label="数据权限" v-show="form.dataScope == 2">
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox> <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox> <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
<el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox> <el-checkbox v-model="form.deptCheckStrictly == 1" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
<el-tree <el-tree
class="tree-border" class="tree-border"
:data="deptOptions" :data="deptOptions"
@ -239,7 +239,7 @@
default-expand-all default-expand-all
ref="dept" ref="dept"
node-key="id" node-key="id"
:check-strictly="!form.deptCheckStrictly" :check-strictly="!form.deptCheckStrictly == 1"
empty-text="加载中，请稍候" empty-text="加载中，请稍候"
:props="defaultProps" :props="defaultProps"
></el-tree> ></el-tree>
@ -440,8 +440,8 @@ export default {
status: "0", status: "0",
menuIds: [], menuIds: [],
deptIds: [], deptIds: [],
menuCheckStrictly: true, menuCheckStrictly: 1,
deptCheckStrictly: true, deptCheckStrictly: 1,
remark: undefined remark: undefined
}; };
this.resetForm("form"); this.resetForm("form");
@ -501,9 +501,9 @@ export default {
// 树权限（父子联动） // 树权限（父子联动）
handleCheckedTreeConnect(value, type) { handleCheckedTreeConnect(value, type) {
if (type == 'menu') { if (type == 'menu') {
this.form.menuCheckStrictly = value ? true: false; this.form.menuCheckStrictly = value ? 1: 0;
} else if (type == 'dept') { } else if (type == 'dept') {
this.form.deptCheckStrictly = value ? true: false; this.form.deptCheckStrictly = value ? 1: 0;
} }
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */

4
script/sql/postgres/postgres_ry_vue_4.X.sql
View File

@ -157,8 +157,8 @@ create table if not exists sys_role
role_key varchar(100) not null, role_key varchar(100) not null,
role_sort int4 not null, role_sort int4 not null,
data_scope char default '1'::bpchar, data_scope char default '1'::bpchar,
menu_check_strictly smallint default 1, menu_check_strictly int2 default 1,
dept_check_strictly smallint default 1, dept_check_strictly int2 default 1,
status char not null, status char not null,
del_flag char default '0'::bpchar, del_flag char default '0'::bpchar,
create_by varchar(64) default ''::varchar, create_by varchar(64) default ''::varchar,