添加角色关联菜单功能

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml

@@ -254,6 +254,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.RoleController.AddInfo(Yi.Framework.DTOModel.RoleInfoDto)">
+            <summary>
+            添加角色包含菜单
+            </summary>
+            <param name="roleDto"></param>
+            <returns></returns>
+        </member>
         <member name="T:Yi.Framework.ApiMicroservice.Controllers.TestController">
             <summary>
             测试控制器

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs

@@ -60,5 +60,17 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         {
             return Result.Success().SetData(await _iRoleService.GetInMenuByRoleId(RoleId));
         }
+
+        /// <summary>
+        /// 添加角色包含菜单
+        /// </summary>
+        /// <param name="roleDto"></param>
+        /// <returns></returns>
+
+        [HttpPost]
+        public async Task<Result> AddInfo(RoleInfoDto roleDto)
+        {
+            return Result.Success().SetData(await _iRoleService.AddInfo(roleDto));
+        }
     }
 }

Yi.Framework.Net6/Yi.Framework.DTOModel/RoleInfoDto.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Model.Models;
+
+namespace Yi.Framework.DTOModel
+{
+    public class RoleInfoDto
+    {
+        public RoleEntity Role { get; set; }
+        public List<long> DeptIds { get; set; }
+        public List<long> MenuIds { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.DTOModel/UserInfoDto.cs

@@ -11,7 +11,7 @@ namespace Yi.Framework.DTOModel
     {
         public UserEntity User { get; set; }
         public List<long> RoleIds { get; set; }
-        public List<long> PostId { get; set; }
+        public List<long> PostIds { get; set; }
         public long? DeptId { get; set; }
     }
 }

Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Yi.Framework.Common.Models;
+using Yi.Framework.DTOModel;
 using Yi.Framework.Model.Models;
 using Yi.Framework.Repository;
 
@@ -36,5 +37,12 @@ namespace Yi.Framework.Interface
         /// <param name="page"></param>
         /// <returns></returns>
         Task<PageModel<List<RoleEntity>>> SelctPageList(RoleEntity role, PageParModel page);
+
+        /// <summary>
+        /// 添加角色关联菜单
+        /// </summary>
+        /// <param name="roleDto"></param>
+        /// <returns></returns>
+       Task<bool> AddInfo(RoleInfoDto roleDto);
     }
 }

Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs

@@ -1,8 +1,10 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Yi.Framework.Common.Models;
+using Yi.Framework.DTOModel;
 using Yi.Framework.Interface;
 using Yi.Framework.Model.Models;
 using Yi.Framework.Repository;
@@ -20,13 +22,13 @@ namespace Yi.Framework.Service
           var _repositoryRoleMenu=  _repository.ChangeRepository<Repository<RoleMenuEntity>>();
             //多次操作，需要事务确保原子性
             return await _repositoryRoleMenu.UseTranAsync(async () =>
-            {
+            {   //删除用户之前所有的用户角色关系（物理删除，没有恢复的必要）
+                await _repositoryRoleMenu.DeleteAsync(u => roleIds.Contains((long)u.RoleId) );
 
                 //遍历用户
                 foreach (var roleId in roleIds)
                 {
-                    //删除用户之前所有的用户角色关系（物理删除，没有恢复的必要）
+                 
-                    await _repositoryRoleMenu.DeleteAsync(u => u.RoleId==roleId);
 
                     //添加新的关系
                     List<RoleMenuEntity> roleMenuEntity = new();
@@ -64,5 +66,14 @@ namespace Yi.Framework.Service
 
             return new PageModel<List<RoleEntity>>(data, total);
         }
+
+
+
+        public async Task<bool> AddInfo(RoleInfoDto roleDto)
+        {
+            var res1 = await _repository.InsertReturnSnowflakeIdAsync(roleDto.Role);
+            var res2 = await GiveRoleSetMenu(new List<long> { res1 }, roleDto.MenuIds);
+            return !0.Equals(res1) && res2;
+        }
     }
 }

Yi.Vue3.X.RuoYi/src/api/system/role.js

@@ -9,10 +9,12 @@ export function listRole(query) {
   })
 }
 
+
+
 // 查询角色详细
 export function getRole(roleId) {
   return request({
-    url: '/system/role/' + roleId,
+    url: '/role/getById/' + roleId,
     method: 'get'
   })
 }
@@ -20,7 +22,7 @@ export function getRole(roleId) {
 // 新增角色
 export function addRole(data) {
   return request({
-    url: '/system/role',
+    url: '/role/addInfo',
     method: 'post',
     data: data
   })
@@ -59,9 +61,14 @@ export function changeRoleStatus(roleId, status) {
 
 // 删除角色
 export function delRole(roleId) {
+  if("string"==typeof(roleId))
+  {
+    roleId=[roleId];
+  }
   return request({
-    url: '/system/role/' + roleId,
+    url: '/role/delList',
-    method: 'delete'
+    method: 'delete',
+    data:roleId
   })
 }
 

Yi.Vue3.X.RuoYi/src/views/system/role/index.vue

@@ -1,269 +1,177 @@
 <template>
-   <div class="app-container">
+  <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-form-item label="角色名称" prop="roleName">
-            <el-input
+        <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
-               v-model="queryParams.roleName"
+          @keyup.enter="handleQuery" />
-               placeholder="请输入角色名称"
+      </el-form-item>
-               clearable
+      <el-form-item label="权限字符" prop="roleCode">
-               style="width: 240px"
+        <el-input v-model="queryParams.roleCode" placeholder="请输入权限字符" clearable style="width: 240px"
-               @keyup.enter="handleQuery"
+          @keyup.enter="handleQuery" />
-            />
+      </el-form-item>
-         </el-form-item>
+      <el-form-item label="状态" prop="isDeleted">
-         <el-form-item label="权限字符" prop="roleCode">
+        <el-select v-model="queryParams.isDeleted" placeholder="角色状态" clearable style="width: 240px">
-            <el-input
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-               v-model="queryParams.roleCode"
+        </el-select>
-               placeholder="请输入权限字符"
+      </el-form-item>
-               clearable
+      <el-form-item label="创建时间" style="width: 308px">
-               style="width: 240px"
+        <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-               @keyup.enter="handleQuery"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-            />
+      </el-form-item>
-         </el-form-item>
+      <el-form-item>
-         <el-form-item label="状态" prop="isDeleted">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-select
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-               v-model="queryParams.isDeleted"
+      </el-form-item>
-               placeholder="角色状态"
+    </el-form>
-               clearable
+    <el-row :gutter="10" class="mb8">
-               style="width: 240px"
+      <el-col :span="1.5">
-            >
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:role:add']">新增</el-button>
-               <el-option
+      </el-col>
-                  v-for="dict in sys_normal_disable"
+      <el-col :span="1.5">
-                  :key="dict.value"
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-                  :label="dict.label"
+          v-hasPermi="['system:role:edit']">修改</el-button>
-                  :value="dict.value"
+      </el-col>
-               />
+      <el-col :span="1.5">
-            </el-select>
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-         </el-form-item>
+          v-hasPermi="['system:role:remove']">删除</el-button>
-         <el-form-item label="创建时间" style="width: 308px">
+      </el-col>
-            <el-date-picker
+      <el-col :span="1.5">
-               v-model="dateRange"
+        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:role:export']">导出
-               value-format="YYYY-MM-DD"
+        </el-button>
-               type="daterange"
+      </el-col>
-               range-separator="-"
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-               start-placeholder="开始日期"
+    </el-row>
-               end-placeholder="结束日期"
+
-            ></el-date-picker>
+    <!-- 表格数据 -->
-         </el-form-item>
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-         <el-form-item>
+      <el-table-column type="selection" width="55" align="center" />
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      <el-table-column label="角色编号" prop="roleCode" width="120" />
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-         </el-form-item>
+      <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>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <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-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-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>
+          <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" />
+
+    <!-- 添加或修改角色配置对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="roleRef" :model="form" :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-icon>
+                  <question-filled />
+                </el-icon>
+              </el-tooltip>
+              权限字符
+            </span>
+          </template>
+          <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-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="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>
+          <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-form-item>
       </el-form>
-      <el-row :gutter="10" class="mb8">
+      <template #footer>
-         <el-col :span="1.5">
+        <div class="dialog-footer">
-            <el-button
+          <el-button type="primary" @click="submitForm">确 定</el-button>
-               type="primary"
+          <el-button @click="cancel">取 消</el-button>
-               plain
+        </div>
-               icon="Plus"
+      </template>
-               @click="handleAdd"
+    </el-dialog>
-               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-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-col>
-         <el-col :span="1.5">
-            <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>
-      </el-row>
 
-      <!-- 表格数据 -->
+    <!-- 分配角色数据权限对话框 -->
-      <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+    <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body>
-         <el-table-column type="selection" width="55" align="center" />
+      <el-form :model="form" label-width="80px">
-         <el-table-column label="角色编号" prop="roleCode" width="120" />
+        <el-form-item label="角色名称">
-         <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
+          <el-input v-model="form.role.roleName" :disabled="true" />
-         <el-table-column label="权限字符" prop="roleCode" :show-overflow-tooltip="true" width="150" />
+        </el-form-item>
-         <el-table-column label="显示顺序" prop="orderNum" width="100" />
+        <el-form-item label="权限字符">
-         <el-table-column label="状态" align="center" width="100">
+          <el-input v-model="form.role.roleCode" :disabled="true" />
-            <template #default="scope">
+        </el-form-item>
-               <el-switch
+        <el-form-item label="权限范围">
-               v-model="scope.row.isDeleted"
+          <el-select v-model="form.role.dataScope" @change="dataScopeSelectChange">
-                       :active-value=false
+            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value">
-                       :inactive-value=true
+            </el-option>
-                  @change="handleStatusChange(scope.row)"
+          </el-select>
-               ></el-switch>
+        </el-form-item>
-            </template>
+        <el-form-item label="数据权限" v-show="form.role.dataScope == 2">
-         </el-table-column>
+          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-         <el-table-column label="创建时间" align="center" prop="createTime">
+          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-            <template #default="scope">
+          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+          </el-checkbox>
-            </template>
+          <el-tree class="tree-border" :data="deptOptions" show-checkbox default-expand-all ref="deptRef" node-key="id"
-         </el-table-column>
+            :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            :props="{ label: 'label', children: 'children' }"></el-tree>
-            <template #default="scope">
+        </el-form-item>
-              <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
+      </el-form>
-                <el-button
+      <template #footer>
-                  type="text"
+        <div class="dialog-footer">
-                  icon="Edit"
+          <el-button type="primary" @click="submitDataScope">确 定</el-button>
-                  @click="handleUpdate(scope.row)"
+          <el-button @click="cancelDataScope">取 消</el-button>
-                  v-hasPermi="['system:role:edit']"
+        </div>
-                ></el-button>
+      </template>
-              </el-tooltip>
+    </el-dialog>
-              <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
+  </div>
-                <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>
-              <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"
-      />
-
-      <!-- 添加或修改角色配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-         <el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
-            <el-form-item label="角色名称" prop="roleName">
-               <el-input v-model="form.roleName" placeholder="请输入角色名称" />
-            </el-form-item>
-            <el-form-item prop="roleKey">
-               <template #label>
-                  <span>
-                     <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-                        <el-icon><question-filled /></el-icon>
-                     </el-tooltip>
-                     权限字符
-                  </span>
-               </template>
-               <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-            </el-form-item>
-            <el-form-item label="角色顺序" prop="roleSort">
-               <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
-            </el-form-item>
-            <el-form-item label="状态">
-               <el-radio-group v-model="form.status">
-                  <el-radio
-                     v-for="dict in sys_normal_disable"
-                     :key="dict.value"
-                     :label="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.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-               <el-tree
-                  class="tree-border"
-                  :data="menuOptions"
-                  show-checkbox
-                  ref="menuRef"
-                  node-key="id"
-                  :check-strictly="!form.menuCheckStrictly"
-                  empty-text="加载中，请稍候"
-                  :props="{ label: 'label', children: 'children' }"
-               ></el-tree>
-            </el-form-item>
-            <el-form-item label="备注">
-               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-
-      <!-- 分配角色数据权限对话框 -->
-      <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-form-item>
-            <el-form-item label="权限字符">
-               <el-input v-model="form.roleKey" :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-option>
-               </el-select>
-            </el-form-item>
-            <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" @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-form-item>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitDataScope">确 定</el-button>
-               <el-button @click="cancelDataScope">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
 </template>
 
 <script setup name="Role">
 import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role";
-import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/menu";
+import { roleMenuTreeselect, treeselect as menuTreeselect, listMenu } from "@/api/system/menu";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
@@ -308,9 +216,9 @@ const data = reactive({
     isDeleted: undefined
   },
   rules: {
-    roleName: [{ required: true, message: "角色名称不能为空", trigger: "blur" }],
+    // roleName: [{ required: true, message: "角色名称不能为空", trigger: "blur" }],
-    roleCode: [{ required: true, message: "权限字符不能为空", trigger: "blur" }],
+    // roleCode: [{ required: true, message: "权限字符不能为空", trigger: "blur" }],
-    orderNum: [{ required: true, message: "角色顺序不能为空", trigger: "blur" }]
+    // orderNum: [{ required: true, message: "角色顺序不能为空", trigger: "blur" }]
   },
 });
 
@@ -338,13 +246,13 @@ function resetQuery() {
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const roleIds = row.roleId || ids.value;
+  const roleIds = row.id || ids.value;
   proxy.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function () {
     return delRole(roleIds);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  }).catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {
@@ -354,15 +262,15 @@ function handleExport() {
 }
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.roleId);
+  ids.value = selection.map(item => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 /** 角色状态修改 */
 function handleStatusChange(row) {
-  let text =row.isDeleted === false? "启用" : "停用";
+  let text = row.isDeleted === false ? "启用" : "停用";
   proxy.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?').then(function () {
-    return changeRoleStatus(row.roleId, row.isDeleted);
+    return changeRoleStatus(row.id, row.isDeleted);
   }).then(() => {
     proxy.$modal.msgSuccess(text + "成功");
   }).catch(function () {
@@ -388,9 +296,14 @@ function handleAuthUser(row) {
 }
 /** 查询菜单树结构 */
 function getMenuTreeselect() {
-  menuTreeselect().then(response => {
+  listMenu().then(response => {
-    menuOptions.value = response.data;
+    const options = [];
-  });
+    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() {
@@ -411,16 +324,20 @@ function reset() {
   deptExpand.value = true;
   deptNodeAll.value = false;
   form.value = {
-    roleId: undefined,
+    role: {
-    roleName: undefined,
+      id: undefined,
-    roleKey: undefined,
+      roleName: undefined,
-    roleSort: 0,
+      roleCode: undefined,
-    status: "0",
+      orderNum: 0,
+      IsDeleted: false,
+      menuCheckStrictly: false,
+      deptCheckStrictly: false,
+      remark: undefined
+    },
     menuIds: [],
-    deptIds: [],
+    deptIds: []
-    menuCheckStrictly: true,
+
-    deptCheckStrictly: true,
+
-    remark: undefined
   };
   proxy.resetForm("roleRef");
 }
@@ -434,11 +351,11 @@ function handleAdd() {
 /** 修改角色 */
 function handleUpdate(row) {
   reset();
-  const roleId = row.roleId || ids.value;
+  const roleId = row.id || ids.value;
   const roleMenu = getRoleMenuTreeselect(roleId);
   getRole(roleId).then(response => {
     form.value = response.data;
-    form.value.roleSort = Number(form.value.roleSort);
+    form.value.orderNum = Number(form.value.orderNum);
     open.value = true;
     nextTick(() => {
       roleMenu.then((res) => {
@@ -510,7 +427,7 @@ function getMenuAllCheckedKeys() {
 function submitForm() {
   proxy.$refs["roleRef"].validate(valid => {
     if (valid) {
-      if (form.value.roleId != undefined) {
+      if (form.value.role.id != undefined) {
         form.value.menuIds = getMenuAllCheckedKeys();
         updateRole(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
@@ -542,8 +459,8 @@ function dataScopeSelectChange(value) {
 /** 分配数据权限操作 */
 function handleDataScope(row) {
   reset();
-  const deptTreeSelect = getDeptTree(row.roleId);
+  const deptTreeSelect = getDeptTree(row.id);
-  getRole(row.roleId).then(response => {
+  getRole(row.id).then(response => {
     form.value = response.data;
     openDataScope.value = true;
     nextTick(() => {
@@ -560,7 +477,7 @@ function handleDataScope(row) {
 }
 /** 提交按钮（数据权限） */
 function submitDataScope() {
-  if (form.value.roleId != undefined) {
+  if (form.value.id != undefined) {
     form.value.deptIds = getDeptAllCheckedKeys();
     dataScope(form.value).then(response => {
       proxy.$modal.msgSuccess("修改成功");

Yi.Vue3.X.RuoYi/src/views/system/user/index.vue

@@ -88,19 +88,19 @@
                </el-table-column>
                <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
                   <template #default="scope">
-                     <el-tooltip content="修改" placement="top" v-if="scope.row.userName !== 'cc'">
+                     <el-tooltip content="修改" placement="top" v-if="scope.row.userName != 'c'">
                         <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)"
                            v-hasPermi="['system:user:edit']"></el-button>
                      </el-tooltip>
-                     <el-tooltip content="删除" placement="top" v-if="scope.row.userName !== 'cc'">
+                     <el-tooltip content="删除" placement="top" v-if="scope.row.userName != 'c'">
                         <el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
                            v-hasPermi="['system:user:remove']"></el-button>
                      </el-tooltip>
-                     <el-tooltip content="重置密码" placement="top" v-if="scope.row.userName !== 'cc'">
+                     <el-tooltip content="重置密码" placement="top" v-if="scope.row.userName != 'c'">
                         <el-button type="text" icon="Key" @click="handleResetPwd(scope.row)"
                            v-hasPermi="['system:user:resetPwd']"></el-button>
                      </el-tooltip>
-                     <el-tooltip content="分配角色" placement="top" v-if="scope.row.userName !== 'cc'">
+                     <el-tooltip content="分配角色" placement="top" v-if="scope.row.userName != 'c'">
                         <el-button type="text" icon="CircleCheck" @click="handleAuthRole(scope.row)"
                            v-hasPermi="['system:user:edit']"></el-button>
                      </el-tooltip>