From a6f30412ade38bc49585fd64e3f0746161db3ea6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 25 三月 2022 15:22:01 +0800
Subject: [PATCH] update 修改角色适配 采用 get set 转换数据类型
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 2 +-
ruoyi-ui/src/views/system/role/index.vue | 16 ++++++++--------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 21 +++++++++++++++++++++
4 files changed, 31 insertions(+), 10 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 8d91660..7e65339 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
@@ -137,4 +137,25 @@
return UserConstants.ADMIN_ID.equals(this.roleId);
}
+ public Boolean getMenuCheckStrictly() {
+ if (menuCheckStrictly == null) {
+ return null;
+ }
+ return menuCheckStrictly == 1;
+ }
+
+ public void setMenuCheckStrictly(Boolean menuCheckStrictly) {
+ this.menuCheckStrictly = menuCheckStrictly ? 1 : 0;
+ }
+
+ public Boolean getDeptCheckStrictly() {
+ if (deptCheckStrictly == null) {
+ return null;
+ }
+ return deptCheckStrictly == 1;
+ }
+
+ public void setDeptCheckStrictly(Boolean deptCheckStrictly) {
+ this.deptCheckStrictly = deptCheckStrictly ? 1 : 0;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 0b6fc70..32e06d3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -85,7 +85,7 @@
@Override
public List<Long> selectDeptListByRoleId(Long roleId) {
SysRole role = roleMapper.selectById(roleId);
- return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly() == 1);
+ return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly());
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 8772313..2f9d002 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -123,7 +123,7 @@
@Override
public List<Long> selectMenuListByRoleId(Long roleId) {
SysRole role = roleMapper.selectById(roleId);
- return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly() == 1);
+ return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly());
}
/**
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index a120245..b08cf34 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -187,14 +187,14 @@
<el-form-item label="鑿滃崟鏉冮檺">
<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="form.menuCheckStrictly == 1" @change="handleCheckedTreeConnect($event, 'menu')">鐖跺瓙鑱斿姩</el-checkbox>
+ <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">鐖跺瓙鑱斿姩</el-checkbox>
<el-tree
class="tree-border"
:data="menuOptions"
show-checkbox
ref="menu"
node-key="id"
- :check-strictly="!form.menuCheckStrictly == 1"
+ :check-strictly="!form.menuCheckStrictly"
empty-text="鍔犺浇涓紝璇风◢鍊�"
:props="defaultProps"
></el-tree>
@@ -231,7 +231,7 @@
<el-form-item label="鏁版嵁鏉冮檺" v-show="form.dataScope == 2">
<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="form.deptCheckStrictly == 1" @change="handleCheckedTreeConnect($event, 'dept')">鐖跺瓙鑱斿姩</el-checkbox>
+ <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">鐖跺瓙鑱斿姩</el-checkbox>
<el-tree
class="tree-border"
:data="deptOptions"
@@ -239,7 +239,7 @@
default-expand-all
ref="dept"
node-key="id"
- :check-strictly="!form.deptCheckStrictly == 1"
+ :check-strictly="!form.deptCheckStrictly"
empty-text="鍔犺浇涓紝璇风◢鍊�"
:props="defaultProps"
></el-tree>
@@ -440,8 +440,8 @@
status: "0",
menuIds: [],
deptIds: [],
- menuCheckStrictly: 1,
- deptCheckStrictly: 1,
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
remark: undefined
};
this.resetForm("form");
@@ -501,9 +501,9 @@
// 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛�
handleCheckedTreeConnect(value, type) {
if (type == 'menu') {
- this.form.menuCheckStrictly = value ? 1: 0;
+ this.form.menuCheckStrictly = value ? true: false;
} else if (type == 'dept') {
- this.form.deptCheckStrictly = value ? 1: 0;
+ this.form.deptCheckStrictly = value ? true: false;
}
},
/** 鏂板鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3