IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Maksim Chegulov 2021-09-28 20:30:02 +03:00
parent 82cb6ddb6a
commit 1c4d1efa83
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
common/ASC.Core.Common/Context/Impl/UserManager.cs
View File

@ -161,7 +161,6 @@ namespace ASC.Core
public DateTime GetMaxUsersLastModified()
{
return UserService.GetUsers(Tenant.TenantId, default)
.Values
.Select(g => g.LastModified)
.DefaultIfEmpty()
.Max();
@ -176,17 +175,11 @@ namespace ASC.Core
}
public UserInfo GetUserByUserName(string username)
{
if (CoreBaseSettings.Personal)
{
var u = UserService.GetUserByUserName(TenantManager.GetCurrentTenant().TenantId, username);
return u ?? Constants.LostUser;
}
return GetUsersInternal()
.FirstOrDefault(u => string.Compare(u.UserName, username, StringComparison.CurrentCultureIgnoreCase) == 0) ?? Constants.LostUser;
}
public UserInfo GetUserBySid(string sid)
{
return GetUsersInternal()
@ -242,17 +235,10 @@ namespace ASC.Core
{
if (string.IsNullOrEmpty(email)) return Constants.LostUser;
if (CoreBaseSettings.Personal)
{
var u = UserService.GetUser(Tenant.TenantId, email);
return u != null && !u.Removed ? u : Constants.LostUser;
}
return GetUsersInternal()
.FirstOrDefault(u => string.Compare(u.Email, email, StringComparison.CurrentCultureIgnoreCase) == 0) ?? Constants.LostUser;
}
public UserInfo[] Search(string text, EmployeeStatus status)
{
return Search(text, status, Guid.Empty);
@ -520,11 +506,11 @@ namespace ASC.Core
public Guid GetDepartmentManager(Guid deparmentID)
{
return GetRefsInternal()
.Values
.Where(r => r.RefType == UserGroupRefType.Manager && r.GroupId == deparmentID && !r.Removed)
.Select(r => r.UserId)
.SingleOrDefault();
var groupRef = UserService.GetUserGroupRef(Tenant.TenantId, deparmentID, UserGroupRefType.Manager);
if (groupRef == null) return Guid.Empty;
return groupRef.UserId;
}
public void SetDepartmentManager(Guid deparmentID, Guid userID)
@ -574,8 +560,15 @@ namespace ASC.Core
public GroupInfo GetGroupInfo(Guid groupID)
{
return GetGroupsInternal()
.SingleOrDefault(g => g.ID == groupID) ?? Constants.LostGroupInfo;
var group = UserService.GetGroup(Tenant.TenantId, groupID);
return new GroupInfo
{
ID = group.Id,
CategoryID = group.CategoryId,
Name = group.Name,
Sid = group.Sid
};
}
public GroupInfo GetGroupInfoBySid(string sid)
@ -587,7 +580,6 @@ namespace ASC.Core
public DateTime GetMaxGroupsLastModified()
{
return UserService.GetGroups(Tenant.TenantId, default)
.Values
.Select(g => g.LastModified)
.DefaultIfEmpty()
.Max();
@ -634,14 +626,12 @@ namespace ASC.Core
private IEnumerable<UserInfo> GetUsersInternal()
{
return UserService.GetUsers(Tenant.TenantId, default)
.Values
.Where(u => !u.Removed);
}
private IEnumerable<GroupInfo> GetGroupsInternal()
{
return UserService.GetGroups(Tenant.TenantId, default)
.Values
.Where(g => !g.Removed)
.Select(g => new GroupInfo(g.CategoryId) { ID = g.Id, Name = g.Name, Sid = g.Sid })
.Concat(Constants.BuildinGroups);