mirror of
https://gitee.com/dotnetchina/OpenAuth.Net.git
synced 2026-04-08 01:51:28 +08:00
修改用户分配角色操作界面
This commit is contained in:
@@ -14,17 +14,20 @@ namespace OpenAuth.App
|
||||
private IUserRepository _repository;
|
||||
private IModuleRepository _moduleRepository;
|
||||
private IRelevanceRepository _relevanceRepository;
|
||||
private IRepository<ModuleElement> _moduleElementRepository;
|
||||
private IRepository<ModuleElement> _moduleElementRepository;
|
||||
private IResourceRepository _resourceRepository;
|
||||
|
||||
public LoginApp(IUserRepository repository,
|
||||
IModuleRepository moduleRepository,
|
||||
IRelevanceRepository relevanceRepository,
|
||||
IRepository<ModuleElement> moduleElementRepository )
|
||||
IRepository<ModuleElement> moduleElementRepository,
|
||||
IResourceRepository resourceRepository)
|
||||
{
|
||||
_repository = repository;
|
||||
_moduleRepository = moduleRepository;
|
||||
_relevanceRepository = relevanceRepository;
|
||||
_moduleElementRepository = moduleElementRepository;
|
||||
_resourceRepository = resourceRepository;
|
||||
}
|
||||
|
||||
public LoginUserVM Login(string userName, string password)
|
||||
@@ -64,8 +67,15 @@ namespace OpenAuth.App
|
||||
{
|
||||
module.Elements = _moduleElementRepository.Find(u => u.ModuleId == module.Id && elementIds.Contains( u.Id)).ToList();
|
||||
}
|
||||
|
||||
return loginVM;
|
||||
|
||||
//<2F>û<EFBFBD><C3BB><EFBFBD>ɫ<EFBFBD><C9AB><EFBFBD>Լ<EFBFBD><D4BC><EFBFBD><EFBFBD>䵽<EFBFBD><E4B5BD><EFBFBD><EFBFBD>ԴID
|
||||
var resourceIds = _relevanceRepository.Find(
|
||||
u =>
|
||||
(u.FirstId == user.Id && u.Key == "UserResource") ||
|
||||
(u.Key == "RoleResource" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
|
||||
loginVM.Resources = _resourceRepository.Find(u => resourceIds.Contains(u.Id)).ToList();
|
||||
|
||||
return loginVM;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -86,6 +96,8 @@ namespace OpenAuth.App
|
||||
{
|
||||
module.Elements = _moduleElementRepository.Find(u => u.ModuleId == module.Id).ToList();
|
||||
}
|
||||
|
||||
loginUser.Resources = _resourceRepository.Find(null).ToList();
|
||||
return loginUser;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,9 +96,9 @@ namespace OpenAuth.App
|
||||
}
|
||||
}
|
||||
|
||||
public List<RoleVM> LoadWithUser(int userId)
|
||||
public List<RoleVM> LoadForOrgAndUser(int orgId, int userId)
|
||||
{
|
||||
var roleIds = _repository.Find(null).ToList();
|
||||
var roleIds = _repository.Find(u =>u.OrgId == orgId).ToList();
|
||||
var rolevms = new List<RoleVM>();
|
||||
foreach (var role in roleIds)
|
||||
{
|
||||
|
||||
@@ -27,6 +27,14 @@ namespace OpenAuth.App.ViewModel
|
||||
/// 用户可以访问到的模块(包括所属角色与自己的所有模块)
|
||||
/// </summary>
|
||||
public List<ModuleView> Modules { get; set; }
|
||||
|
||||
//用户可以访问的资源
|
||||
public List<Resource> Resources { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 用户所属机构
|
||||
/// </summary>
|
||||
public List<Org> Orgs { get; set; }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user