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

修改用户发邮件
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hang
2024-12-26 16:23:30 +08:00
parent 32e3153434
commit e0779ab295
8 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
-3
View File
@@ -17,7 +17,6 @@ namespace IRaCIS.Core.Application.ViewModel
public string? ActionUserName { get; set; }
public UserTypeEnum? ActionUserTypeEnum { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
@@ -25,8 +24,6 @@ namespace IRaCIS.Core.Application.ViewModel
public string TargetIdentityUserName { get; set; }
public UserTypeEnum? OptUserTypeEnum { get; set; }
public string JsonObj { get; set; }
public string IPRegion { get; set; }
IRaCIS.Core.Application/Service/Management/UserService.cs
+2 -3
View File
@@ -908,13 +908,12 @@ namespace IRaCIS.Core.Application.Service
var userLogQueryable =
_userLogRepository.AsQueryable().IgnoreQueryFilters()
.WhereIf(inQuery.TrialId != null, t => t.CreateUserRole.UserRoleTrials.Any(c => c.TrialId == inQuery.TrialId && (c.UserId == t.LoginUserId || c.UserId == t.OptUserId)))
.WhereIf(inQuery.TrialId != null, t => t.ActionIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId))
.WhereIf(trialCreateTime != null, t => t.CreateTime >= trialCreateTime)
.WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
.WhereIf(inQuery.UserId != null, t => t.LoginUserId == inQuery.UserId)
.WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)
.WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate)
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.CreateUserRole.UserName.Contains(inQuery.LoginUserName!))
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.ActionUserName.Contains(inQuery.LoginUserName!))
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.LoginFaildName.Contains(inQuery.LoginFaildName!))
.WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))
.WhereIf(inQuery.LoginUserTypeEnum != null, t => t.CreateUserRole.UserTypeEnum == inQuery.LoginUserTypeEnum)
IRaCIS.Core.Application/Service/Management/_MapConfig.cs
+1 -2
View File
@@ -123,8 +123,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<UserLog, UserLogView>()
.ForMember(d => d.TargetIdentityUserName, c => c.MapFrom(t => t.TargetIdentityUser.UserName))
.ForMember(d => d.ActionUserTypeEnum, c => c.MapFrom(t => t.CreateUserRole.UserTypeEnum));
.ForMember(d => d.TargetIdentityUserName, c => c.MapFrom(t => t.TargetIdentityUser.UserName));
CreateMap<UserFeedBack, UserFeedBackView>()