feat:添加角色授权用户

Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/RoleService.cs

@@ -1,3 +1,5 @@
+using System.Linq.Expressions;
+using System.Reflection.Metadata;
 using Furion.DatabaseAccessor;
 using SqlSugar;
 using Yi.Framework.Infrastructure.Ddd.Dtos;
@@ -6,6 +8,7 @@ using Yi.Framework.Infrastructure.Ddd.Services;
 using Yi.Framework.Infrastructure.Helper;
 using Yi.Furion.Application.Rbac.Domain;
 using Yi.Furion.Core.Rbac.Dtos.Role;
+using Yi.Furion.Core.Rbac.Dtos.User;
 using Yi.Furion.Core.Rbac.Entities;
 using Yi.Furion.Core.Rbac.Enums;
 
@@ -17,13 +20,14 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
     public class RoleService : CrudAppService<RoleEntity, RoleGetOutputDto, RoleGetListOutputDto, long, RoleGetListInputVo, RoleCreateInputVo, RoleUpdateInputVo>,
        IRoleService, ITransient, IDynamicApiController
     {
-        public RoleService(RoleManager roleManager, IRepository<RoleDeptEntity> roleDeptRepository) =>
+        public RoleService(RoleManager roleManager, IRepository<RoleDeptEntity> roleDeptRepository, IRepository<UserRoleEntity> userRoleRepository) =>
-           (_roleManager, _roleDeptRepository) =
+           (_roleManager, _roleDeptRepository, _userRoleRepository) =
-            (roleManager, roleDeptRepository);
+            (roleManager, roleDeptRepository, userRoleRepository);
         private RoleManager _roleManager { get; set; }
 
         private IRepository<RoleDeptEntity> _roleDeptRepository;
 
+        private IRepository<UserRoleEntity> _userRoleRepository;
         [UnitOfWork]
         public async Task UpdateDataScpoceAsync(UpdateDataScpoceInput input)
         {
@@ -31,7 +35,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
             if (input.DataScope == DataScopeEnum.CUSTOM)
             {
                 await _roleDeptRepository.DeleteAsync(x => x.RoleId == input.RoleId);
-                var insertEntities = input.DeptIds.Select(x => new RoleDeptEntity {Id=SnowflakeHelper.NextId, DeptId = x, RoleId = input.RoleId }).ToList();
+                var insertEntities = input.DeptIds.Select(x => new RoleDeptEntity { Id = SnowflakeHelper.NextId, DeptId = x, RoleId = input.RoleId }).ToList();
                 await _roleDeptRepository.InsertRangeAsync(insertEntities);
             }
             await _repository._Db.Updateable(new RoleEntity() { Id = input.RoleId, DataScope = input.DataScope }).UpdateColumns(x => x.DataScope).ExecuteCommandAsync();
@@ -116,5 +120,71 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
             await _repository.UpdateAsync(entity);
             return await MapToGetOutputDtoAsync(entity);
         }
+
+
+        /// <summary>
+        /// 获取角色下的用户
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <param name="input"></param>
+        /// <param name="isAllocated">是否在该角色下</param>
+        /// <returns></returns>
+        [Route("/api/role/auth-user/{roleId}/{isAllocated}")]
+        public async Task<PagedResultDto<UserGetListOutputDto>> GetAuthUserByRoleIdAsync([FromRoute] long roleId, [FromRoute] bool isAllocated, [FromQuery] RoleAuthUserGetListInput input)
+        {
+
+            //角色下已授权用户
+            if (isAllocated == true)
+            {
+                RefAsync<int> total = 0;
+                var output = await _userRoleRepository._DbQueryable
+                             .LeftJoin<UserEntity>((ur, u) => ur.UserId == u.Id && ur.RoleId == roleId)
+                               .Where((ur, u) => ur.RoleId == roleId)
+                             .WhereIF(!string.IsNullOrEmpty(input.UserName), (ur, u) => u.UserName.Contains(input.UserName))
+                             .WhereIF(input.Phone is not null, (ur, u) => u.Phone.ToString().Contains(input.Phone.ToString()))
+                             .Select((ur, u) => new UserGetListOutputDto { Id = u.Id }, true)
+                             .ToPageListAsync(input.PageNum, input.PageSize, total);
+                return new PagedResultDto<UserGetListOutputDto>(total, output);
+            }
+            //角色下未授权用户
+            else
+            {
+                RefAsync<int> total = 0;
+                var entities = await _userRoleRepository._Db.Queryable<UserEntity>()
+                    .Where(u => SqlFunc.Subqueryable<UserRoleEntity>().Where(x => x.RoleId == roleId).Where(x => x.UserId == u.Id).NotAny())
+                       .WhereIF(!string.IsNullOrEmpty(input.UserName), u => u.UserName.Contains(input.UserName))
+                             .WhereIF(input.Phone is not null, u => u.Phone.ToString().Contains(input.Phone.ToString()))
+                    .ToPageListAsync(input.PageNum, input.PageSize, total);
+                var output = entities.Adapt<List<UserGetListOutputDto>>();
+                return new PagedResultDto<UserGetListOutputDto>(total, output);
+            }
+        }
+
+
+
+
+        /// <summary>
+        /// 批量给用户授权
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task CreateAuthUserAsync(RoleAuthUserCreateOrDeleteInput input)
+        {
+            var userRoleEntities = input.UserIds.Select(u => new UserRoleEntity { Id = SnowflakeHelper.NextId, RoleId = input.RoleId, UserId = u }).ToList();
+            await _userRoleRepository.InsertRangeAsync(userRoleEntities);
+        }
+
+
+        /// <summary>
+        /// 批量取消授权
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task DeleteAuthUserAsync(RoleAuthUserCreateOrDeleteInput input)
+        {
+            await _userRoleRepository._Db.Deleteable<UserRoleEntity>().Where(x => x.RoleId == input.RoleId)
+                .Where(x => input.UserIds.Contains(x.UserId))
+                .ExecuteCommandAsync(); ;
+        }
     }
 }

Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml

@@ -451,6 +451,29 @@
             <param name="state"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.Furion.Application.Rbac.Services.Impl.RoleService.GetAuthUserByRoleIdAsync(System.Int64,System.Boolean,Yi.Furion.Core.Rbac.Dtos.Role.RoleAuthUserGetListInput)">
+            <summary>
+            获取角色下的用户
+            </summary>
+            <param name="roleId"></param>
+            <param name="input"></param>
+            <param name="isAllocated">是否在该角色下</param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Furion.Application.Rbac.Services.Impl.RoleService.CreateAuthUserAsync(Yi.Furion.Core.Rbac.Dtos.Role.RoleAuthUserCreateOrDeleteInput)">
+            <summary>
+            批量给用户授权
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Furion.Application.Rbac.Services.Impl.RoleService.DeleteAuthUserAsync(Yi.Furion.Core.Rbac.Dtos.Role.RoleAuthUserCreateOrDeleteInput)">
+            <summary>
+            批量取消授权
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:Yi.Furion.Application.Rbac.Services.Impl.TaskService.GetById(System.String)">
             <summary>
             单查job

Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleAuthUserCreateOrDeleteInput.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Infrastructure.Ddd.Dtos;
+
+namespace Yi.Furion.Core.Rbac.Dtos.Role
+{
+    public class RoleAuthUserCreateOrDeleteInput 
+    {
+        [Required]
+        public long RoleId { get; set; }
+
+        [Required]
+        public List<long> UserIds { get; set; }
+    }
+}

Yi.Furion.Net6/Yi.Furion.Core/Rbac/Dtos/Role/RoleAuthUserGetListInput.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Infrastructure.Ddd.Dtos;
+
+namespace Yi.Furion.Core.Rbac.Dtos.Role
+{
+    public class RoleAuthUserGetListInput: PagedAndSortedResultRequestDto
+    {
+        public string? UserName { get; set; }
+
+        public long? Phone { get; set; }
+    }
+}

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

@@ -63,18 +63,18 @@ export function delRole(roleId) {
 }
 
 // 查询角色已授权用户列表
-export function allocatedUserList(query) {
+export function allocatedUserList(roleId,query) {
   return request({
-    url: '/system/role/authUser/allocatedList',
+    url: `/role/auth-user/${roleId}/true`,
     method: 'get',
     params: query
   })
 }
 
 // 查询角色未授权用户列表
-export function unallocatedUserList(query) {
+export function unallocatedUserList(roleId,query) {
   return request({
-    url: '/system/role/authUser/unallocatedList',
+    url: `/role/auth-user/${roleId}/false`,
     method: 'get',
     params: query
   })
@@ -83,8 +83,8 @@ export function unallocatedUserList(query) {
 // 取消用户授权角色
 export function authUserCancel(data) {
   return request({
-    url: '/system/role/authUser/cancel',
+    url: '/role/auth-user',
-    method: 'put',
+    method: 'delete',
     data: data
   })
 }
@@ -92,18 +92,18 @@ export function authUserCancel(data) {
 // 批量取消用户授权角色
 export function authUserCancelAll(data) {
   return request({
-    url: '/system/role/authUser/cancelAll',
+    url: '/role/auth-user',
-    method: 'put',
+    method: 'delete',
-    params: data
+    data: data
   })
 }
 
 // 授权用户选择
 export function authUserSelectAll(data) {
   return request({
-    url: '/system/role/authUser/selectAll',
+    url: '/role/auth-user',
-    method: 'put',
+    method: 'post',
-    params: data
+    data: data
   })
 }
 

Yi.RuoYi.Vue3/src/store/modules/permission.js

@@ -346,7 +346,6 @@ const usePermissionStore = defineStore(
 //       }
 //   }
 // ];
-console.log(response.data,"response.data")
      const res=response.data;
 
 const sdata = JSON.parse(JSON.stringify(res))

Yi.RuoYi.Vue3/src/views/system/role/authUser.vue

@@ -11,9 +11,9 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="手机号码" prop="phonenumber">
+         <el-form-item label="手机号码" prop="phone">
             <el-input
-               v-model="queryParams.phonenumber"
+               v-model="queryParams.phone"
                placeholder="请输入手机号码"
                clearable
                style="width: 240px"
@@ -60,17 +60,17 @@
       <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+         <el-table-column label="用户昵称" prop="nick" :show-overflow-tooltip="true" />
          <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+         <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
-         <el-table-column label="状态" align="center" prop="status">
+         <el-table-column label="状态" align="center" prop="state">
             <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+               <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+         <el-table-column label="创建时间" align="center" prop="creationTime" width="180">
             <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+               <span>{{ parseTime(scope.row.creationTime) }}</span>
             </template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -116,15 +116,15 @@ const queryParams = reactive({
   pageSize: 10,
   roleId: route.params.roleId,
   userName: undefined,
-  phonenumber: undefined,
+  phone: undefined,
 });
 
 /** 查询授权用户列表 */
 function getList() {
   loading.value = true;
-  allocatedUserList(queryParams).then(response => {
+  allocatedUserList(queryParams.roleId,queryParams).then(response => {
-    userList.value = response.rows;
+    userList.value = response.data.items;
-    total.value = response.total;
+    total.value = response.data.total;
     loading.value = false;
   });
 }
@@ -155,7 +155,7 @@ function openSelectUser() {
 /** 取消授权按钮操作 */
 function cancelAuthUser(row) {
   proxy.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function () {
-    return authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
+    return authUserCancel({ userIds: [row.id], roleId: queryParams.roleId });
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("取消授权成功");

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

@@ -325,7 +325,7 @@ function handleCommand(command, row) {
 }
 /** 分配用户 */
 function handleAuthUser(row) {
-  router.push("/system/role-auth/user/" + row.roleId);
+  router.push("/system/role-auth/user/" + row.id);
 }
 /** 查询菜单树结构 */
 function getMenuTreeselect() {

Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue

@@ -10,9 +10,9 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="手机号码" prop="phonenumber">
+         <el-form-item label="手机号码" prop="phone">
             <el-input
-               v-model="queryParams.phonenumber"
+               v-model="queryParams.phone"
                placeholder="请输入手机号码"
                clearable
                @keyup.enter="handleQuery"
@@ -27,17 +27,17 @@
          <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="260px">
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+            <el-table-column label="用户昵称" prop="nick" :show-overflow-tooltip="true" />
             <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-            <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+            <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
-            <el-table-column label="状态" align="center" prop="status">
+            <el-table-column label="状态" align="center" prop="state">
                <template #default="scope">
-                  <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+                  <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
                </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <el-table-column label="创建时间" align="center" prop="creationTime" width="180">
                <template #default="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                  <span>{{ parseTime(scope.row.creationTime) }}</span>
                </template>
             </el-table-column>
          </el-table>
@@ -80,7 +80,7 @@ const queryParams = reactive({
   pageSize: 10,
   roleId: undefined,
   userName: undefined,
-  phonenumber: undefined
+  phone: undefined
 });
 
 // 显示弹框
@@ -95,13 +95,13 @@ function clickRow(row) {
 }
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  userIds.value = selection.map(item => item.userId);
+  userIds.value = selection.map(item => item.id);
 }
 // 查询表数据
 function getList() {
-  unallocatedUserList(queryParams).then(res => {
+  unallocatedUserList(queryParams.roleId,queryParams).then(res => {
-    userList.value = res.rows;
+    userList.value = res.data.items;
-    total.value = res.total;
+    total.value = res.data.total;
   });
 }
 /** 搜索按钮操作 */
@@ -123,8 +123,8 @@ function handleSelectUser() {
     proxy.$modal.msgError("请选择要分配的用户");
     return;
   }
-  authUserSelectAll({ roleId: roleId, userIds: uIds }).then(res => {
+  authUserSelectAll({ roleId: roleId, userIds: [uIds] }).then(res => {
-    proxy.$modal.msgSuccess(res.msg);
+    proxy.$modal.msgSuccess("成功");
     if (res.code === 200) {
       visible.value = false;
       emit("ok");

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

@@ -100,10 +100,10 @@
                         <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 != 'cc'">
                         <el-button type="text" icon="CircleCheck" @click="handleAuthRole(scope.row)"
                            v-hasPermi="['system:user:edit']"></el-button>
-                     </el-tooltip>
+                     </el-tooltip> -->
                   </template>
                </el-table-column>
             </el-table>