wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev

Browse Source
This commit is contained in:
潘飞
2023-04-04 20:19:23 +08:00
parent 7741e44a80 34b3dac9f1
commit 645a8beef7
5 changed files with 122 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
system/Tnb.Systems/Permission/UsersService.cs
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();