|
|
|
@ -100,7 +100,7 @@ namespace GDZZ.Application
|
|
|
|
|
List<UserOutput> userls = new List<UserOutput>();
|
|
|
|
|
var users = await this._sysUserRep.AsQueryable().Filter("TenantId", true)
|
|
|
|
|
.LeftJoin<OnlineUser>((u, o) => u.Id == o.UserId)
|
|
|
|
|
.Where((u, o) => u.AdminType == AdminType.None)
|
|
|
|
|
.Where((u, o) => u.AdminType == AdminType.None&&o.ConnectionId !=null)
|
|
|
|
|
.Select((u, o) => new UserOutput
|
|
|
|
|
{
|
|
|
|
|
Account = u.Account,
|
|
|
|
@ -116,7 +116,8 @@ namespace GDZZ.Application
|
|
|
|
|
Tel = u.Tel,
|
|
|
|
|
TenantId = u.TenantId,
|
|
|
|
|
ConnectionId = o.ConnectionId,
|
|
|
|
|
Profile = u.Profile
|
|
|
|
|
Profile = u.Profile,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
.ToListAsync();
|
|
|
|
@ -125,6 +126,7 @@ namespace GDZZ.Application
|
|
|
|
|
{
|
|
|
|
|
var userDto = user.Adapt<UserOutput>();
|
|
|
|
|
userDto.SysEmpInfo = await _sysEmpService.GetEmpTSInfo(long.Parse(user.Id));
|
|
|
|
|
|
|
|
|
|
if (!userDto.SysEmpInfo.Positions.Count.IsNullOrZero())
|
|
|
|
|
userls.Add(userDto);
|
|
|
|
|
|
|
|
|
|