xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户列表部门岗位角色信息

Browse Source
This commit is contained in:
陈淳
2022-09-13 19:04:41 +08:00
parent 89762cad78
commit e78e9d8e55
5 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Program.cs
View File

@@ -135,7 +135,7 @@ ServiceLocator.Instance = app.Services;
#region #region
//<2F><><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD>ע<EFBFBD><D7A2> //<2F><><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD>ע<EFBFBD><D7A2>
#endregion #endregion
app.UseErrorHandlingService(); //app.UseErrorHandlingService();
#region #region
//<2F><>̬<EFBFBD>ļ<EFBFBD>ע<EFBFBD><D7A2> //<2F><>̬<EFBFBD>ļ<EFBFBD>ע<EFBFBD><D7A2>
#endregion #endregion

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

5
Yi.Framework.Net6/Yi.Framework.Model/UserEntity.cs
View File

@@ -14,6 +14,11 @@ namespace Yi.Framework.Model.Models
[Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.UserId), nameof(UserRoleEntity.RoleId))] [Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.UserId), nameof(UserRoleEntity.RoleId))]
public List<RoleEntity> Roles { get; set; } public List<RoleEntity> Roles { get; set; }
[Navigate(typeof(UserPostEntity), nameof(UserPostEntity.UserId), nameof(UserPostEntity.PostId))]
public List<PostEntity> Posts { get; set; }
[Navigate( NavigateType.OneToOne,nameof(DeptId))]
public DeptEntity Dept { get; set; }
/// <summary> /// <summary>
/// 构建密码，MD5盐值加密 /// 构建密码，MD5盐值加密

4
Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
View File

@@ -131,7 +131,7 @@ namespace Yi.Framework.Service
public async Task<UserEntity> GetInfoById(long userId) public async Task<UserEntity> GetInfoById(long userId)
{ {
return await _repository._DbQueryable.Includes(u => u.Roles).InSingleAsync(userId); return await _repository._DbQueryable.Includes(u => u.Roles).Includes(u=>u.Posts).Includes(u=>u.Dept).InSingleAsync(userId);
} }
public async Task<UserRoleMenuDto> GetUserAllInfo(long userId) public async Task<UserRoleMenuDto> GetUserAllInfo(long userId)
@@ -194,6 +194,8 @@ namespace Yi.Framework.Service
.WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime)
.WhereIF(user.IsDeleted.IsNotNull(),u => u.IsDeleted == user.IsDeleted) .WhereIF(user.IsDeleted.IsNotNull(),u => u.IsDeleted == user.IsDeleted)
.Includes(u => u.Roles) .Includes(u => u.Roles)
.Includes(u=>u.Posts)
.Includes(u=>u.Dept)
.OrderBy(u => u.OrderNum, OrderByType.Desc) .OrderBy(u => u.OrderNum, OrderByType.Desc)
.ToPageListAsync(page.PageNum, page.PageSize, total); .ToPageListAsync(page.PageNum, page.PageSize, total);

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

@@ -71,7 +71,7 @@
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" key="nick" prop="nick" v-if="columns[2].visible" <el-table-column label="用户昵称" align="center" key="nick" prop="nick" v-if="columns[2].visible"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" <el-table-column label="部门" align="center" key="dept.deptName" prop="dept.deptName" v-if="columns[3].visible"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible" <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible"
width="120" /> width="120" />
@@ -504,14 +504,25 @@ function handleUpdate(row) {
reset(); reset();
const userId = row.id || ids.value; const userId = row.id || ids.value;
getUser(userId).then(response => { getUser(userId).then(response => {
form.value.user = response.data; form.value.user = response.data;
form.value.postIds = [];
response.data.roles.forEach(role => { response.data.posts.forEach(post => {
form.value.roleIds.push(role.id) form.value.postIds.push(post.id)
}); });
open.value = true;
title.value = "修改用户"; form.value.deptId= response.data.deptId;
form.value.user.password = null;
response.data.roles.forEach(role => {
form.value.roleIds.push(role.id)
});
open.value = true;
title.value = "修改用户";
form.value.user.password = null;
}); });
}; };
/** 提交按钮 */ /** 提交按钮 */