From 0e6113f0a61bcac6539d8f9ac8cde385928f77e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Fri, 16 Sep 2022 18:57:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/SwaggerDoc.xml                     |   6 +
 .../Controllers/RoleController.cs             |  11 +-
 .../yi-sqlsugar-dev.db                        | Bin 151552 -> 151552 bytes
 .../Yi.Framework.Interface/IRoleService.cs    |  15 +
 .../Yi.Framework.Service/RoleService.cs       |  38 +-
 Yi.Vue3.X.RuoYi/src/api/system/role.js        |   2 +-
 .../src/views/system/role/index.vue           | 654 ++++++++++++------
 7 files changed, 507 insertions(+), 219 deletions(-)

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
index b1d379e1..704bf226 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
@@ -351,6 +351,12 @@
             <param name="isDel"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.RoleController.UpdateDataScpoce(Yi.Framework.DTOModel.RoleInfoDto)">
+             <summary>
+            更改角色数据权限
+             </summary>
+             <returns></returns>
+        </member>
         <member name="T:Yi.Framework.ApiMicroservice.Controllers.TestController">
             <summary>
             测试控制器
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
index 738acd95..de57f7a6 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
@@ -85,9 +85,16 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         public async Task<Result> UpdateStatus(long roleId, bool isDel)
         {
             return Result.Success().SetData(await _iRoleService._repository.UpdateIgnoreNullAsync(new RoleEntity() { Id = roleId, IsDeleted = isDel }));
-
         }
 
-      
+        /// <summary>
+        ///更改角色数据权限
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> UpdateDataScpoce(RoleInfoDto roleDto)
+        {
+            return Result.Success().SetStatus(await _iRoleService.UpdateDataScpoce(roleDto));
+        }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index 6010d8eb458d1aa4e7ada590e64a95d9987c3deb..9861e3b1b5ad8636772619ab75602312ff8f2098 100644
GIT binary patch
delta 1041
zcmaiyO=uHA6oB7sHj`a-XI9FZN|e@<Ub<#yHoMtakT#%rsX`G8rHzt6C{#tngBMd&
zyx4=X*rODo>di{fg1MBcP^2Ju7xW^YMJNOWC;O9Tqma2h9^bt0{Vc7jORMUm9BMy4
zQckzQJp1x>?df^42{Ms^W{FInlWJ4H@LQvEl7>g1Tvh;vP*(Ln&u1InnB|OG#ZrNl
z@}B8Btl%=2<ry2x_oukSTwY(iUAt1dx^Qh)*6?8{PpINE<)~_WZ0%Mjb@=h-;m=o3
zk{@uZ#5}WLJ0A1AWGWZu+@j@LjE8vjCauCH|HJ$<RQBtY({v`K;aq5bP%%{hM#bpr
zi61O(Iz>Cr?LPB3<$1Pi-)mPk+7+~K{g6U*pj-4lJwp}pi7b;TqHAB8$3|OP;~fS#
z1;N9{&h*-vq)P^#{j)B5OR95Lvbo7^&)B}xx_noMaYe%kdS<vK>FED-G;fz1+jal?
zmY_2oy3tcSz+nKceS6z{Q3DvqeZ{BeRwjjdw3a^ga3PM>RZmBBquY50M+5Q5UED&V
z^Po5kpu6f~xiKy3cg8+-qT@dF{p*DE&)9=?yM;Y>an&)tN27ssq>d8w$*4FCz+?B7
zO*AagWpO*VXybT%FzSI6M#fIKf2AjYOc;dA!94*=_XHqEK`@6@Pk^NTDXhkln%Gu`
RTm<@_KA`6|NM8Ci@)x%k>pcJf

delta 232
zcmZozz}c{XbAmMEr-?Gote+V4f)h5T%=70fV_@NvVBi<$JHWq=Phzt`z!%=h1_B~E
zF)X}nk_^tyoD2-Y9I_muM|Xcub`oHCwzd1k`l&_+Mn<{@mb!+<3WnxZh6Yw9MtT+o
zW~Qcw7TBfC4J}QK4ULQ;+LMd<lNr3^8H}AdfTlBwPd*=K!xGBG%QpE)+#*Kr$?5U-
z;(A6FCKiSk<^jySY|;>wf*hh8lMCZbIbd?lzv8$5if827u$)DJQDHla0n;CO0L4Z<
A*Z=?k

diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs
index fde0871c..fffcbe3d 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs
@@ -52,5 +52,20 @@ namespace Yi.Framework.Interface
         /// <param name="roleDto"></param>
         /// <returns></returns>
         Task<bool> UpdateInfo(RoleInfoDto roleDto);
+
+        /// <summary>
+        /// 给角色设置部门
+        /// </summary>
+        /// <param name="roleIds"></param>
+        /// <param name="deptIds"></param>
+        /// <returns></returns>
+        Task<bool> GiveRoleSetDept(List<long> roleIds, List<long> deptIds);
+
+        /// <summary>
+        /// 更新角色数据权限
+        /// </summary>
+        /// <param name="roleDto"></param>
+        /// <returns></returns>
+        Task<bool> UpdateDataScpoce(RoleInfoDto roleDto);
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs
index 290165e3..47dc8f9c 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs
@@ -28,8 +28,6 @@ namespace Yi.Framework.Service
                 //遍历用户
                 foreach (var roleId in roleIds)
                 {
-                 
-
                     //添加新的关系
                     List<RoleMenuEntity> roleMenuEntity = new();
                     foreach (var menu in menuIds)
@@ -76,12 +74,46 @@ namespace Yi.Framework.Service
             return !0.Equals(res1) && res2;
         }
 
+        public async Task<bool> GiveRoleSetDept(List<long> roleIds,List<long> deptIds)
+        {
+            var _repositoryRoleDept = _repository.ChangeRepository<Repository<RoleDeptEntity>>();
+            //多次操作，需要事务确保原子性
+            return await _repositoryRoleDept.UseTranAsync(async () =>
+            {   //删除用户之前所有的用户角色关系（物理删除，没有恢复的必要）
+                await _repositoryRoleDept.DeleteAsync(u => roleIds.Contains((long)u.RoleId));
+
+                //遍历角色
+                foreach (var roleId in roleIds)
+                {
+                    //添加新的关系
+                    List<RoleDeptEntity> roleDeptEntity = new();
+                    foreach (var dept in deptIds)
+                    {
+                        roleDeptEntity.Add(new RoleDeptEntity() { RoleId = roleId, DeptId = dept });
+                    }
+
+                    //一次性批量添加
+                    await _repositoryRoleDept.InsertReturnSnowflakeIdAsync(roleDeptEntity);
+                }
+            });
+        }
 
         public async Task<bool> UpdateInfo(RoleInfoDto roleDto)
         {
             var res1 = await _repository.UpdateIgnoreNullAsync(roleDto.Role);
             var res2 = await GiveRoleSetMenu(new List<long> { roleDto.Role.Id }, roleDto.MenuIds);
-            return res1 && res2;
+            var res3 = await GiveRoleSetDept(new List<long> { roleDto.Role.Id }, roleDto.DeptIds);
+            return res1 && res2&& res3;
+        }
+
+        public async Task<bool> UpdateDataScpoce(RoleInfoDto roleDto)
+        {
+           var role= new RoleEntity();
+            role.Id = roleDto.Role.Id;
+            role.DataScope = roleDto.Role.DataScope;
+            var res1 = await _repository.UpdateIgnoreNullAsync(role);
+            var res3 = await GiveRoleSetDept(new List<long> { roleDto.Role.Id }, roleDto.DeptIds);
+            return res1 && res3;
         }
     }
 }
diff --git a/Yi.Vue3.X.RuoYi/src/api/system/role.js b/Yi.Vue3.X.RuoYi/src/api/system/role.js
index 7f401116..f000bd81 100644
--- a/Yi.Vue3.X.RuoYi/src/api/system/role.js
+++ b/Yi.Vue3.X.RuoYi/src/api/system/role.js
@@ -40,7 +40,7 @@ export function updateRole(data) {
 // 角色数据权限
 export function dataScope(data) {
   return request({
-    url: '/system/role/dataScope',
+    url: '/role/UpdateDataScpoce',
     method: 'put',
     data: data
   })
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
index ea2bfefb..194a43b8 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
@@ -1,58 +1,139 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      v-show="showSearch"
+      :inline="true"
+    >
       <el-form-item label="角色名称" prop="roleName">
-        <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
-          @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.roleName"
+          placeholder="请输入角色名称"
+          clearable
+          style="width: 240px"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="权限字符" prop="roleCode">
-        <el-input v-model="queryParams.roleCode" placeholder="请输入权限字符" clearable style="width: 240px"
-          @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.roleCode"
+          placeholder="请输入权限字符"
+          clearable
+          style="width: 240px"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="状态" prop="isDeleted">
-        <el-select v-model="queryParams.isDeleted" placeholder="角色状态" clearable style="width: 240px">
-          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        <el-select
+          v-model="queryParams.isDeleted"
+          placeholder="角色状态"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" style="width: 308px">
-        <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker
+          v-model="dateRange"
+          value-format="YYYY-MM-DD"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:role:add']">新增</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['system:role:add']"
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['system:role:edit']">修改</el-button>
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:role:edit']"
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['system:role:remove']">删除</el-button>
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:role:remove']"
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:role:export']">导出
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['system:role:export']"
+          >导出
         </el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <!-- 表格数据 -->
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="roleList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="角色编号" prop="roleCode" width="120" />
-      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="权限字符" prop="roleCode" :show-overflow-tooltip="true" width="150" />
+      <el-table-column
+        label="角色名称"
+        prop="roleName"
+        :show-overflow-tooltip="true"
+        width="150"
+      />
+      <el-table-column
+        label="权限字符"
+        prop="roleCode"
+        :show-overflow-tooltip="true"
+        width="150"
+      />
       <el-table-column label="显示顺序" prop="orderNum" width="100" />
       <el-table-column label="状态" align="center" width="100">
         <template #default="scope">
-          <el-switch v-model="scope.row.isDeleted" :active-value=false :inactive-value=true
-            @change="handleStatusChange(scope.row)"></el-switch>
+          <el-switch
+            v-model="scope.row.isDeleted"
+            :active-value="false"
+            :inactive-value="true"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime">
@@ -60,41 +141,93 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
-          <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
-            <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
+          <el-tooltip
+            content="修改"
+            placement="top"
+            v-if="scope.row.roleId !== 1"
+          >
+            <el-button
+              type="text"
+              icon="Edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:role:edit']"
+            >
             </el-button>
           </el-tooltip>
-          <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
-            <el-button type="text" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']">
+          <el-tooltip
+            content="删除"
+            placement="top"
+            v-if="scope.row.roleId !== 1"
+          >
+            <el-button
+              type="text"
+              icon="Delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['system:role:remove']"
+            >
             </el-button>
           </el-tooltip>
-          <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
-            <el-button type="text" icon="CircleCheck" @click="handleDataScope(scope.row)"
-              v-hasPermi="['system:role:edit']"></el-button>
+          <el-tooltip
+            content="数据权限"
+            placement="top"
+            v-if="scope.row.roleId !== 1"
+          >
+            <el-button
+              type="text"
+              icon="CircleCheck"
+              @click="handleDataScope(scope.row)"
+              v-hasPermi="['system:role:edit']"
+            ></el-button>
           </el-tooltip>
-          <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
-            <el-button type="text" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']">
+          <el-tooltip
+            content="分配用户"
+            placement="top"
+            v-if="scope.row.roleId !== 1"
+          >
+            <el-button
+              type="text"
+              icon="User"
+              @click="handleAuthUser(scope.row)"
+              v-hasPermi="['system:role:edit']"
+            >
             </el-button>
           </el-tooltip>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改角色配置对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="roleRef" :model="form.role" :rules="rules" label-width="100px">
+      <el-form
+        ref="roleRef"
+        :model="form.role"
+        :rules="rules"
+        label-width="100px"
+      >
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.role.roleName" placeholder="请输入角色名称" />
         </el-form-item>
         <el-form-item prop="roleCode">
           <template #label>
             <span>
-              <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+              <el-tooltip
+                content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)"
+                placement="top"
+              >
                 <el-icon>
                   <question-filled />
                 </el-icon>
@@ -105,24 +238,55 @@
           <el-input v-model="form.role.roleCode" placeholder="请输入权限字符" />
         </el-form-item>
         <el-form-item label="角色顺序" prop="orderNum">
-          <el-input-number v-model="form.role.orderNum" controls-position="right" :min="0" />
+          <el-input-number
+            v-model="form.role.orderNum"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.role.isDeleted">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
+            <el-radio
+              v-for="dict in sys_normal_disable"
+              :key="dict.value"
+              :label="JSON.parse(dict.value)"
+              >{{ dict.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <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.role.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动
+          <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.role.menuCheckStrictly"
+            @change="handleCheckedTreeConnect($event, 'menu')"
+            >父子联动
           </el-checkbox>
-          <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menuRef" node-key="id"
-            :check-strictly="!form.role.menuCheckStrictly" empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"></el-tree>
+          <el-tree
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            ref="menuRef"
+            node-key="id"
+            :check-strictly="!form.role.menuCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"
+          ></el-tree>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.role.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input
+            v-model="form.role.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          ></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -134,28 +298,60 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      v-model="openDataScope"
+      width="500px"
+      append-to-body
+    >
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
-          <el-input v-model="form.roleName" :disabled="true" />
+          <el-input v-model="form.role.roleName" :disabled="true" />
         </el-form-item>
         <el-form-item label="权限字符">
-          <el-input v-model="form.roleCode" :disabled="true" />
+          <el-input v-model="form.role.roleCode" :disabled="true" />
         </el-form-item>
         <el-form-item label="权限范围">
-          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            v-model="form.role.dataScope"
+            @change="dataScopeSelectChange"
+          >
+            <el-option
+              v-for="item in dataScopeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="数据权限" v-show="form.dataScope == 1">
-          <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" @change="handleCheckedTreeConnect($event, 'dept')">父子联动
+        <el-form-item label="数据权限" v-show="form.role.dataScope == 1">
+          <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"
+            @change="handleCheckedTreeConnect($event, 'dept')"
+            >父子联动
           </el-checkbox>
-          <el-tree class="tree-border" :data="deptOptions" show-checkbox default-expand-all ref="deptRef" node-key="id"
-            :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"></el-tree>
+          <el-tree
+            class="tree-border"
+            :data="deptOptions"
+            show-checkbox
+            default-expand-all
+            ref="deptRef"
+            node-key="id"
+            :check-strictly="!form.deptCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"
+          ></el-tree>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -165,14 +361,25 @@
         </div>
       </template>
     </el-dialog>
-    
   </div>
 </template>
 
 <script setup name="Role">
-import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole } from "@/api/system/role";
-import { roleMenuTreeselect, treeselect as menuTreeselect, listMenu } from "@/api/system/menu";
-import { listDept,roleDeptTreeselect } from "@/api/system/dept";
+import {
+  addRole,
+  changeRoleStatus,
+  dataScope,
+  delRole,
+  getRole,
+  listRole,
+  updateRole,
+} from "@/api/system/role";
+import {
+  roleMenuTreeselect,
+  treeselect as menuTreeselect,
+  listMenu,
+} from "@/api/system/menu";
+import { listDept, roleDeptTreeselect } from "@/api/system/dept";
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
@@ -203,7 +410,7 @@ const dataScopeOptions = ref([
   { value: 1, label: "自定数据权限" },
   { value: 2, label: "本部门数据权限" },
   { value: 3, label: "本部门及以下数据权限" },
-  { value: 4, label: "仅本人数据权限" }
+  { value: 4, label: "仅本人数据权限" },
 ]);
 
 const data = reactive({
@@ -213,12 +420,18 @@ const data = reactive({
     pageSize: 10,
     roleName: undefined,
     roleCode: undefined,
-    isDeleted: undefined
+    isDeleted: undefined,
   },
   rules: {
-    roleName: [{ required: true, message: "角色名称不能为空", trigger: "blur" }],
-    roleCode: [{ required: true, message: "权限字符不能为空", trigger: "blur" }],
-    orderNum: [{ required: true, message: "角色顺序不能为空", trigger: "blur" }]
+    roleName: [
+      { required: true, message: "角色名称不能为空", trigger: "blur" },
+    ],
+    roleCode: [
+      { required: true, message: "权限字符不能为空", trigger: "blur" },
+    ],
+    orderNum: [
+      { required: true, message: "角色顺序不能为空", trigger: "blur" },
+    ],
   },
 });
 
@@ -227,11 +440,13 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询角色列表 */
 function getList() {
   loading.value = true;
-  listRole(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    roleList.value = response.data.data;
-    total.value = response.data.total;
-    loading.value = false;
-  });
+  listRole(proxy.addDateRange(queryParams.value, dateRange.value)).then(
+    (response) => {
+      roleList.value = response.data.data;
+      total.value = response.data.total;
+      loading.value = false;
+    }
+  );
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -247,35 +462,47 @@ function resetQuery() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const roleIds = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function () {
-    return delRole(roleIds);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => { });
+  proxy.$modal
+    .confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?')
+    .then(function () {
+      return delRole(roleIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("system/role/export", {
-    ...queryParams.value,
-  }, `role_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    "system/role/export",
+    {
+      ...queryParams.value,
+    },
+    `role_${new Date().getTime()}.xlsx`
+  );
 }
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 /** 角色状态修改 */
 function handleStatusChange(row) {
   let text = row.isDeleted === false ? "启用" : "停用";
-  proxy.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?').then(function () {
-    return changeRoleStatus(row.id, row.isDeleted);
-  }).then(() => {
-    proxy.$modal.msgSuccess(text + "成功");
-  }).catch(function () {
-    row.isDeleted = row.isDeleted === "0" ? "1" : "0";
-  });
+  proxy.$modal
+    .confirm('确认要"' + text + '""' + row.roleName + '"角色吗?')
+    .then(function () {
+      return changeRoleStatus(row.id, row.isDeleted);
+    })
+    .then(() => {
+      proxy.$modal.msgSuccess(text + "成功");
+    })
+    .catch(function () {
+      row.isDeleted = row.isDeleted === "0" ? "1" : "0";
+    });
 }
 /** 更多操作 */
 function handleCommand(command, row) {
@@ -296,13 +523,18 @@ function handleAuthUser(row) {
 }
 /** 查询菜单树结构 */
 function getMenuTreeselect() {
-  listMenu().then(response => {
+  listMenu().then((response) => {
     const options = [];
-    response.data.forEach(m => {
-      options.push({ id: m.id, label: m.menuName, parentId: m.parentId, children: m.children })
-    })
+    response.data.forEach((m) => {
+      options.push({
+        id: m.id,
+        label: m.menuName,
+        parentId: m.parentId,
+        children: m.children,
+      });
+    });
     menuOptions.value = proxy.handleTree(options);
-  })
+  });
 }
 /** 所有部门节点数据 */
 function getDeptAllCheckedKeys() {
@@ -332,12 +564,10 @@ function reset() {
       menuCheckStrictly: false,
       deptCheckStrictly: false,
       remark: undefined,
-      dataScope:0
+      dataScope: 0,
     },
     menuIds: [],
-    deptIds: []
-
-
+    deptIds: [],
   };
   proxy.resetForm("roleRef");
 }
@@ -353,7 +583,7 @@ function handleUpdate(row) {
   reset();
   const roleId = row.id || ids.value;
   getRoleMenuTreeselect(roleId);
-  getRole(roleId).then(response => {
+  getRole(roleId).then((response) => {
     form.value.role = response.data;
     form.value.role.orderNum = Number(form.value.role.orderNum);
     open.value = true;
@@ -366,149 +596,147 @@ function getRoleMenuTreeselect(roleId) {
   //2：获取全量菜单
   getMenuTreeselect();
 
-  roleMenuTreeselect(roleId).then(response => {
-
+  roleMenuTreeselect(roleId).then((response) => {
     const menuIds = [];
-    response.data.forEach(m => {
-      menuIds.push(m.id)
-    })
-    menuIds.forEach((v) => {
+    response.data.forEach((m) => {
+      menuIds.push(m.id);
+    });
+  
       nextTick(() => {
+        menuIds.forEach((v) => {
         menuRef.value.setChecked(v, true, false);
       });
 
       //这里是要一个当前用户已拥有的菜单的id
-    })
-
+    });
   });
-
-  }
+}
 /** 根据角色ID查询部门树结构 */
 function getDeptTree(roleId) {
-      return listDept().then(response => {
-    
-        const selectList = [];
-      response.data.forEach(res => {
-         selectList.push({ id: res.id, label: res.deptName, parentId: res.parentId, orderNum: res.orderNum, children: [] })
-      }
-
-      )
-      deptOptions.value = proxy.handleTree(selectList, "id");
-
-      const deptIds=[];
-      roleDeptTreeselect(roleId).then(response=>{
-        response.data.forEach(d=>{
-
-          deptIds.push(d.id)
-        })
-      
-
-      })
-      nextTick(() => {
-              if (deptRef.value) {
-                deptRef.value.setCheckedKeys(deptIds);
-              }
-            });
+  return listDept().then((response) => {
+    const selectList = [];
+    response.data.forEach((res) => {
+      selectList.push({
+        id: res.id,
+        label: res.deptName,
+        parentId: res.parentId,
+        orderNum: res.orderNum,
+        children: [],
       });
-    }
+    });
+    deptOptions.value = proxy.handleTree(selectList, "id");
+
+    const deptIds = [];
+    roleDeptTreeselect(roleId).then((response) => {
+
+      deptIds=  response.data.map((x) => x.id)
+    });
+
+    nextTick(() => {
+      if (deptRef.value) {
+        deptRef.value.setCheckedKeys(deptIds);
+      }
+     });
+  });
+}
 /** 树权限（展开/折叠）*/
 function handleCheckedTreeExpand(value, type) {
-      if (type == "menu") {
-        let treeList = menuOptions.value;
-        for (let i = 0; i < treeList.length; i++) {
-          menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      } else if (type == "dept") {
-        let treeList = deptOptions.value;
-        for (let i = 0; i < treeList.length; i++) {
-          deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      }
+  if (type == "menu") {
+    let treeList = menuOptions.value;
+    for (let i = 0; i < treeList.length; i++) {
+      menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
     }
+  } else if (type == "dept") {
+    let treeList = deptOptions.value;
+    for (let i = 0; i < treeList.length; i++) {
+      deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
+    }
+  }
+}
 /** 树权限（全选/全不选） */
 function handleCheckedTreeNodeAll(value, type) {
-      if (type == "menu") {
-        menuRef.value.setCheckedNodes(value ? menuOptions.value : []);
-      } else if (type == "dept") {
-        deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
-      }
-    }
+  if (type == "menu") {
+    menuRef.value.setCheckedNodes(value ? menuOptions.value : []);
+  } else if (type == "dept") {
+    deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
+  }
+}
 /** 树权限（父子联动） */
 function handleCheckedTreeConnect(value, type) {
-      if (type == "menu") {
-        form.value.menuCheckStrictly = value ? true : false;
-      } else if (type == "dept") {
-        form.value.deptCheckStrictly = value ? true : false;
-      }
-    }
+  if (type == "menu") {
+    form.value.menuCheckStrictly = value ? true : false;
+  } else if (type == "dept") {
+    form.value.deptCheckStrictly = value ? true : false;
+  }
+}
 /** 所有菜单节点数据 */
 function getMenuAllCheckedKeys() {
-      // 目前被选中的菜单节点
-      let checkedKeys = menuRef.value.getCheckedKeys();
-      // 半选中的菜单节点
-      let halfCheckedKeys = menuRef.value.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    }
+  // 目前被选中的菜单节点
+  let checkedKeys = menuRef.value.getCheckedKeys();
+  // 半选中的菜单节点
+  let halfCheckedKeys = menuRef.value.getHalfCheckedKeys();
+  checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+  return checkedKeys;
+}
 /** 提交按钮 */
 function submitForm() {
-      proxy.$refs["roleRef"].validate(valid => {
-        if (valid) {
-          if (form.value.role.id != undefined) {
-            form.value.menuIds = getMenuAllCheckedKeys();
-            updateRole(form.value).then(response => {
-              proxy.$modal.msgSuccess("修改成功");
-              open.value = false;
-              getList();
-            });
-          } else {
-            form.value.menuIds = getMenuAllCheckedKeys();
-            addRole(form.value).then(response => {
-              proxy.$modal.msgSuccess("新增成功");
-              open.value = false;
-              getList();
-            });
-          }
-        }
-      });
-    }
-/** 取消按钮 */
-function cancel() {
-      open.value = false;
-      reset();
-    }
-/** 选择角色权限范围触发 */
-function dataScopeSelectChange(value) {
-      if (value !== "2") {
-        deptRef.value.setCheckedKeys([]);
-      }
-    }
-/** 分配数据权限操作 */
-function handleDataScope(row) {
-      reset();
-     getDeptTree(row.id);
-      getRole(row.id).then(response => {
-        form.value = response.data;
-        openDataScope.value = true;    
-        title.value = "分配数据权限";
-      });
-    }
-/** 提交按钮（数据权限） */
-function submitDataScope() {
-      if (form.value.id != undefined) {
-        form.value.deptIds = getDeptAllCheckedKeys();
-        dataScope(form.value).then(response => {
+  proxy.$refs["roleRef"].validate((valid) => {
+    if (valid) {
+      if (form.value.role.id != undefined) {
+        form.value.menuIds = getMenuAllCheckedKeys();
+        updateRole(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
-          openDataScope.value = false;
+          open.value = false;
+          getList();
+        });
+      } else {
+        form.value.menuIds = getMenuAllCheckedKeys();
+        addRole(form.value).then((response) => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
           getList();
         });
       }
     }
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 选择角色权限范围触发 */
+function dataScopeSelectChange(value) {
+  if (value !== "2") {
+    deptRef.value.setCheckedKeys([]);
+  }
+}
+/** 分配数据权限操作 */
+function handleDataScope(row) {
+  reset();
+  getDeptTree(row.id);
+  getRole(row.id).then((response) => {
+    form.value.role = response.data;
+    openDataScope.value = true;
+    title.value = "分配数据权限";
+  });
+}
+/** 提交按钮（数据权限） */
+function submitDataScope() {
+  if (form.value.role.id != undefined) {
+    form.value.deptIds = getDeptAllCheckedKeys();
+    dataScope(form.value).then((response) => {
+      proxy.$modal.msgSuccess("修改成功");
+      openDataScope.value = false;
+      getList();
+    });
+  }
+}
 /** 取消按钮（数据权限）*/
 function cancelDataScope() {
-      openDataScope.value = false;
-      reset();
-    }
+  openDataScope.value = false;
+  reset();
+}
 
 getList();
 </script>