Compare commits
No commits in common. "a33b7d606be08ff69c3f304cb509ee50524f84da" and "6f254ca958925585eca3df7137389785169e3b2b" have entirely different histories.
a33b7d606b
...
6f254ca958
|
|
@ -162,12 +162,14 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
//正式或者培训的项目 不能允许测试用户（必须正式用户） 同时必须是内部的用户
|
//正式或者培训的项目 不能允许测试用户（必须正式用户） 同时必须是内部的用户
|
||||||
.WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IdentityUser.IsTestUser == false
|
.WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IdentityUser.IsTestUser == false
|
||||||
&& (t.IdentityUser.IsZhiZhun
|
&& (t.IdentityUser.IsZhiZhun
|
||||||
|| t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC
|
|| t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC
|
||||||
|| t.UserTypeRole.UserTypeEnum == UserTypeEnum.MIM))
|
|| t.UserTypeRole.UserTypeEnum==UserTypeEnum.MIM))
|
||||||
|
|
||||||
//测试项目 可以加入 测试用户 或者内部正式用户
|
//测试项目 可以加入 测试用户 或者内部正式用户
|
||||||
.WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && t.IdentityUser.IsZhiZhun))
|
.WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && (t.IdentityUser.IsZhiZhun
|
||||||
|
|| t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC
|
||||||
|
|| t.UserTypeRole.UserTypeEnum == UserTypeEnum.MIM)))
|
||||||
.Where(t => userTypeEnums.Contains(t.UserTypeEnum))
|
.Where(t => userTypeEnums.Contains(t.UserTypeEnum))
|
||||||
.WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum)
|
.WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum)
|
||||||
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName))
|
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue