update 修改角色适配 采用 get set 转换数据类型

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java

@@ -137,4 +137,33 @@ public class SysRole extends BaseEntity {
         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;
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -84,7 +84,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
     @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());
     }
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -123,7 +123,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @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());
     }
 
     /**

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 @@ export default {
         status: "0",
         menuIds: [],
         deptIds: [],
-        menuCheckStrictly: 1,
+        menuCheckStrictly: true,
-        deptCheckStrictly: 1,
+        deptCheckStrictly: true,
         remark: undefined
       };
       this.resetForm("form");
@@ -501,9 +501,9 @@ export default {
     // 树权限（父子联动）
     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;
       }
     },
     /** 新增按钮操作 */