XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

角色修改
continuous-integration/drone/push Build is running Details

Test_IRC_Net8
hang 2025-02-24 13:43:21 +08:00
parent 1c3ddcf1cd
commit 8b53517f2c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs
View File

@ -53,7 +53,7 @@ namespace IRaCIS.Core.Application.Contracts
public string PermissionStr { get; set; } = string.Empty;
public int Order { get; set; }
public bool IsEnable { get; set; }
public List<Guid> UserTypeGroupIdList { get; set; } = new List<Guid>();

5
IRaCIS.Core.Application/Service/Management/UserTypeService.cs
View File

@ -20,6 +20,7 @@ namespace IRaCIS.Core.Application.Contracts
{
var userTypeRoleQueryable = _userTypeRepository
.WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.IsEnable == true)
.WhereIf(!string.IsNullOrWhiteSpace(userTypeQuery.SearchFilter), t => t.Description.Contains(userTypeQuery.SearchFilter!) || t.UserTypeName.Contains(userTypeQuery.SearchFilter!) || t.UserTypeShortName.Contains(userTypeQuery.SearchFilter!))
.WhereIf(userTypeQuery.GroupId != null, t => t.UserTypeGroupList.Any(t => t.DictionaryId == userTypeQuery.GroupId))
@ -158,7 +159,9 @@ namespace IRaCIS.Core.Application.Contracts
public async Task<List<TrialUserType>> GetTrialUserTypeList()
{
//排除其他组的用户
var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
var query = _userTypeRepository
.WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.IsEnable == true)
.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
.Where(t => !t.UserTypeGroupList.Any(t => t.Group.Code == "3"))
.OrderBy(t => t.UserTypeShortName).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);