Compare commits

...

2 Commits

Author SHA1 Message Date
he 6bb167b919 Merge branch 'master' of http://192.168.3.68:2000/XCKJ/510k 2024-10-23 15:14:17 +08:00
he 6db5c4b51d 510k 修改 2024-10-23 15:14:17 +08:00
2 changed files with 2 additions and 2 deletions

View File

@ -26,7 +26,7 @@ namespace IRaCIS.Core.Application.Contracts
public async Task<List<UserTypeRoleView>> GetUserTypeRoleList(UserTypeQuery userTypeQuery) public async Task<List<UserTypeRoleView>> GetUserTypeRoleList(UserTypeQuery userTypeQuery)
{ {
var userTypeRoleQueryable = userTypeServiceRepository.Where(t=>t.UserTypeEnum !=UserTypeEnum.Administrator) var userTypeRoleQueryable = userTypeServiceRepository.Where(t=>t.UserTypeEnum !=UserTypeEnum.SuperAdmin)
.WhereIf(!string.IsNullOrWhiteSpace(userTypeQuery.SearchFilter), t => t.Description.Contains(userTypeQuery.SearchFilter!) || t.UserTypeName.Contains(userTypeQuery.SearchFilter!) || t.UserTypeShortName.Contains(userTypeQuery.SearchFilter!)) .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)) .WhereIf(userTypeQuery.GroupId!=null,t=>t.UserTypeGroupList.Any(t=>t.DictionaryId== userTypeQuery.GroupId))

View File

@ -63,7 +63,7 @@
ShareImage = 125, ShareImage = 125,
Administrator= 99, SuperAdmin = 99,
Undefined=0 Undefined=0