1、系统权限,组织管理,返回用户列表新增组织分类字段

2、新增根据表名清除表数据字段
3、根据表名动态建类功能接口
This commit is contained in:
DEVICE8\12494
2023-04-04 19:13:12 +08:00
parent 92291d66c2
commit 72f25fad66
5 changed files with 120 additions and 12 deletions

View File

@@ -534,14 +534,16 @@ public class UsersService : IUsersService, IDynamicApiController, ITransient
[HttpPost("GetUserList")]
public async Task<dynamic> GetUserList([FromBody] UserRelationInput input)
{
var data = await _repository.AsQueryable().Where(it => it.EnabledMark > 0 && it.DeleteMark == null)
.Where(it => input.userId.Contains(it.Id))
.Select(it => new OrganizeMemberListOutput()
var data = await _repository.AsSugarClient().Queryable<UserEntity, OrganizeEntity>((u, org) => new JoinQueryInfos(JoinType.Inner, u.OrganizeId == org.Id))
.Where((u, org) => u.EnabledMark > 0 && u.DeleteMark == null)
.Where((u, org) => input.userId.Contains(u.Id))
.Select((u, org) => new OrganizeMemberListOutput()
{
id = it.Id,
fullName = SqlFunc.MergeString(it.RealName, "/", it.Account),
headIcon = SqlFunc.MergeString("/api/File/Image/userAvatar/", it.HeadIcon),
enabledMark = it.EnabledMark,
id = u.Id,
fullName = SqlFunc.MergeString(u.RealName, "/", u.Account),
headIcon = SqlFunc.MergeString("/api/File/Image/userAvatar/", u.HeadIcon),
enabledMark = u.EnabledMark,
type = org.FullName,
}).ToListAsync();
data = data.OrderBy(x => input.userId.IndexOf(x.id)).ToList();