XCKJ
/
EI-Med-Viewer-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改用户角色名称

master
hang 2023-10-08 11:41:08 +08:00
parent 011b588f08
commit ac9d2767df
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -461,7 +461,7 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<PageOutput<UserListDTO>> GetUserList(UserListQueryDTO param) public async Task<PageOutput<UserListDTO>> GetUserList(UserListQueryDTO param)
{ {
var userQueryable = _userRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) var userQueryable = _userRepository.Where(x => x.UserTypeEnum != UserTypeEnum.NormalAdmin && x.UserTypeEnum!=UserTypeEnum.SuperAdmin)
.WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.UserName.Contains(param.UserName) ) .WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.UserName.Contains(param.UserName) )
.WhereIf(!string.IsNullOrWhiteSpace(param.RealName), t => t.FullName.Contains(param.RealName)) .WhereIf(!string.IsNullOrWhiteSpace(param.RealName), t => t.FullName.Contains(param.RealName))
.WhereIf(!string.IsNullOrWhiteSpace(param.Phone), t => t.Phone.Contains(param.Phone)) .WhereIf(!string.IsNullOrWhiteSpace(param.Phone), t => t.Phone.Contains(param.Phone))

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

@ -112,7 +112,7 @@ namespace IRaCIS.Core.Application.Contracts
userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.IndependentReviewer, UserTypeEnum.ClinicalResearchCoordinator }; userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.IndependentReviewer, UserTypeEnum.ClinicalResearchCoordinator };
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin) if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin)
{ {
userTypeEnums.Add(UserTypeEnum.ProjectManager); userTypeEnums.Add(UserTypeEnum.ProjectManager);
} }
@ -140,7 +140,7 @@ namespace IRaCIS.Core.Application.Contracts
var query = userTypeServiceRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) var query = userTypeServiceRepository.Where(x => x.UserTypeEnum != UserTypeEnum.NormalAdmin)
.WhereIf(userTypeSelectEnum != UserTypeSelectEnum.None, t => userTypeEnums.Contains(t.UserTypeEnum)) .WhereIf(userTypeSelectEnum != UserTypeSelectEnum.None, t => userTypeEnums.Contains(t.UserTypeEnum))
.OrderBy(t => t.Order).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider); .OrderBy(t => t.Order).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);
@ -157,7 +157,7 @@ namespace IRaCIS.Core.Application.Contracts
/// <returns></returns> /// <returns></returns>
public async Task<List<TrialUserType>> GetTrialUserTypeList() public async Task<List<TrialUserType>> GetTrialUserTypeList()
{ {
var query = userTypeServiceRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) var query = userTypeServiceRepository.Where(x => x.UserTypeEnum != UserTypeEnum.NormalAdmin)
//.Where(t => t.Type == UserTypeGroup.TrialUser) //.Where(t => t.Type == UserTypeGroup.TrialUser)
.OrderBy(t => t.Order).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider); .OrderBy(t => t.Order).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);

2
IRaCIS.Core.Application/Service/Stat/StatisticsService.cs
View File

@ -62,7 +62,7 @@ namespace IRaCIS.Application.Services
workloadLambda = workloadLambda.And(x => x.WorkTime >= bDate && x.WorkTime < eDate); workloadLambda = workloadLambda.And(x => x.WorkTime >= bDate && x.WorkTime < eDate);
Expression<Func<Trial, bool>> trialLambda = x => true; Expression<Func<Trial, bool>> trialLambda = x => true;
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin) //超级管理员按照条件查询所有 if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin) //超级管理员按照条件查询所有
{ {
if (param.CroId != null) if (param.CroId != null)
{ {

16
IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
View File

@ -33,17 +33,17 @@ namespace IRaCIS.Core.Application
return new PersonalStataDTO() return new PersonalStataDTO()
{ {
//正参与的数量 //正参与的数量
TrialCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin TrialCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin
? await _trialRepository.CountAsync() ? await _trialRepository.CountAsync()
: await _trialUserRepository.Where(t => t.UserId == _userInfo.Id).CountAsync(), : await _trialUserRepository.Where(t => t.UserId == _userInfo.Id).CountAsync(),
DeletedCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin DeletedCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin
? await _trialRepository.AsQueryable(true).CountAsync(t => t.IsDeleted) ? await _trialRepository.AsQueryable(true).CountAsync(t => t.IsDeleted)
: await _trialUserRepository.AsQueryable(true).Where(t => t.UserId == _userInfo.Id && t.IsDeleted) : await _trialUserRepository.AsQueryable(true).Where(t => t.UserId == _userInfo.Id && t.IsDeleted)
.CountAsync(), .CountAsync(),
TotalNeedSignTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin TotalNeedSignTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin
? 0 ? 0
: await _trialDocumentRepository.AsQueryable(true).Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped) : await _trialDocumentRepository.AsQueryable(true).Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id)) .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@ -52,7 +52,7 @@ namespace IRaCIS.Core.Application
.SelectMany(t => t.NeedConfirmedUserTypeList) .SelectMany(t => t.NeedConfirmedUserTypeList)
.CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId), .CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId),
HaveSignedTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin HaveSignedTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin
? 0 ? 0
//废除了 已经签署了也要算进去 //废除了 已经签署了也要算进去
: await _trialDocumentRepository.AsQueryable(true).Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped) : await _trialDocumentRepository.AsQueryable(true).Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
@ -61,7 +61,7 @@ namespace IRaCIS.Core.Application
.SelectMany(t => t.TrialDocConfirmedUserList) .SelectMany(t => t.TrialDocConfirmedUserList)
.CountAsync(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime !=null), .CountAsync(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime !=null),
TotalNeedSignSystemDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin TotalNeedSignSystemDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin
? 0 ? 0
: await _systemDocumentRepository : await _systemDocumentRepository
.Where(t => t.IsDeleted == false || (t.IsDeleted == true && t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime !=null))) .Where(t => t.IsDeleted == false || (t.IsDeleted == true && t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime !=null)))
@ -69,7 +69,7 @@ namespace IRaCIS.Core.Application
.CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId), .CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId),
HaveSignedSystemDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin HaveSignedSystemDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin
? 0 ? 0
: await _systemDocumentRepository : await _systemDocumentRepository
.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)) .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
@ -84,12 +84,12 @@ namespace IRaCIS.Core.Application
:0, :0,
TotalSystemNoticeCount= _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin TotalSystemNoticeCount= _userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin
? 0:await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum== Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished) ? 0:await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum== Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished)
.CountAsync(), .CountAsync(),
NeedReadSystemNoticeCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin NeedReadSystemNoticeCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin
? 0 : await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished ? 0 : await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished
&& !t.NoticeUserReadList.Any(t=>t.CreateUserId==_userInfo.Id)) && !t.NoticeUserReadList.Any(t=>t.CreateUserId==_userInfo.Id))
.Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > DateTime.Now) .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > DateTime.Now)

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
View File

@ -110,14 +110,14 @@ namespace IRaCIS.Application.Services
var trialType = _trialRepository.Where(t => t.Id == trialUserQuery.TrialId).Select(t => t.TrialType).FirstOrDefault(); var trialType = _trialRepository.Where(t => t.Id == trialUserQuery.TrialId).Select(t => t.TrialType).FirstOrDefault();
var userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.IQC, UserTypeEnum.APM, UserTypeEnum.MIM, UserTypeEnum.QA, UserTypeEnum.MW }; var userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.IQC, UserTypeEnum.APM, UserTypeEnum.MIM, UserTypeEnum.QA, UserTypeEnum.MW };
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin) if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.NormalAdmin)
{ {
userTypeEnums.Add(UserTypeEnum.ProjectManager); userTypeEnums.Add(UserTypeEnum.ProjectManager);
} }
//之前已经选择的用户 不放在列表中，现在又要改回去 废弃 //之前已经选择的用户 不放在列表中，现在又要改回去 废弃
var query = _repository.Where<User>(t => t.UserTypeEnum != UserTypeEnum.SuperAdmin) var query = _repository.Where<User>(t => t.UserTypeEnum != UserTypeEnum.NormalAdmin)
////正式或者培训的项目 不能允许测试用户（必须正式用户） 同时必须是内部的用户 ////正式或者培训的项目 不能允许测试用户（必须正式用户） 同时必须是内部的用户
//.WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IsTestUser == false && t.IsZhiZhun) //.WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IsTestUser == false && t.IsZhiZhun)

6
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

@ -70,7 +70,7 @@ namespace IRaCIS.Application.Services
.WhereIf(multiModalityIdSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Modality) == multiModalityIdSelectCount) .WhereIf(multiModalityIdSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Modality) == multiModalityIdSelectCount)
.WhereIf(multiCriteriaSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Criterion) == multiCriteriaSelectCount) .WhereIf(multiCriteriaSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Criterion) == multiCriteriaSelectCount)
.WhereIf(multiReviewTypeSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.ReviewType) == multiReviewTypeSelectCount) .WhereIf(multiReviewTypeSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.ReviewType) == multiReviewTypeSelectCount)
.WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false) .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.NormalAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false)
.ProjectTo<TrialDetailDTO>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id }); .ProjectTo<TrialDetailDTO>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id });
return await query.ToPagedListAsync(searchParam.PageIndex, searchParam.PageSize, string.IsNullOrWhiteSpace(searchParam.SortField) ? "CreateTime" : searchParam.SortField, searchParam.Asc); return await query.ToPagedListAsync(searchParam.PageIndex, searchParam.PageSize, string.IsNullOrWhiteSpace(searchParam.SortField) ? "CreateTime" : searchParam.SortField, searchParam.Asc);
@ -82,7 +82,7 @@ namespace IRaCIS.Application.Services
public async Task<List<TrialSelectDTO>> GetTrialSelect() public async Task<List<TrialSelectDTO>> GetTrialSelect()
{ {
return await _trialRepository.AsQueryable().IgnoreQueryFilters() return await _trialRepository.AsQueryable().IgnoreQueryFilters()
.WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false) .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.NormalAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false)
.ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).ToListAsync();
} }
@ -693,7 +693,7 @@ namespace IRaCIS.Application.Services
.WhereIf(searchModel.Expedited != null, o => o.Expedited == searchModel.Expedited) .WhereIf(searchModel.Expedited != null, o => o.Expedited == searchModel.Expedited)
.WhereIf(!string.IsNullOrEmpty(searchModel.Code), o => o.TrialCode.Contains(searchModel.Code)) .WhereIf(!string.IsNullOrEmpty(searchModel.Code), o => o.TrialCode.Contains(searchModel.Code))
.WhereIf(!string.IsNullOrWhiteSpace(searchModel.Indication), o => o.Indication.Contains(searchModel.Indication)) .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Indication), o => o.Indication.Contains(searchModel.Indication))
.WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id)) .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.NormalAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.ProjectTo<TrialDetailDTO>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id }); .ProjectTo<TrialDetailDTO>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id });

2
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -296,7 +296,7 @@ namespace IRaCIS.Core.Application.Service
var userTypeId = Guid.Empty; var userTypeId = Guid.Empty;
CreateMap<Trial, DocSignStat>() CreateMap<Trial, DocSignStat>()
.ForMember(t => t.WaitSignCount, u => .ForMember(t => t.WaitSignCount, u =>
u.MapFrom(c => userTypeEnumInt == (int)UserTypeEnum.SuperAdmin ? 0 u.MapFrom(c => userTypeEnumInt == (int)UserTypeEnum.NormalAdmin ? 0
: c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == userTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == userId && t.ConfirmTime!=null)).Count()) : c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == userTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == userId && t.ConfirmTime!=null)).Count())
); );

2
IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs
View File

@ -148,7 +148,7 @@ namespace IRaCIS.Core.Domain.Share
if (userType != null && !string.IsNullOrEmpty(userType.Value)) if (userType != null && !string.IsNullOrEmpty(userType.Value))
{ {
return int.Parse(userType.Value) == (int)UserTypeEnum.SuperAdmin; return int.Parse(userType.Value) == (int)UserTypeEnum.NormalAdmin;
} }
return false; return false;
} }

4
IRaCIS.Core.Domain.Share/User/UserType.cs
View File

@ -26,7 +26,7 @@
Dashboard = 6, Dashboard = 6,
// 超级管理员用户类型，用于取代 SuperAdmin字段 数据库不内置这个用户类型和角色的配置，因为只允许有一个 // 超级管理员用户类型，用于取代 SuperAdmin字段 数据库不内置这个用户类型和角色的配置，因为只允许有一个
SuperAdmin=8, NormalAdmin=8,
@ -63,7 +63,7 @@
ShareImage = 125, ShareImage = 125,
SuperAdmin=99,
Undefined=0 Undefined=0