diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index 71f6de8ea..5f205ff5b 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -34,6 +34,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? LoginUserId { get; set; }
public Guid? OptUserId { get; set; }
+
+ public string IPRegion { get; set; }
}
///UserLogQuery 列表查询参数模型
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
index 07dca77ed..bf2769f68 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
@@ -55,6 +55,17 @@ namespace IRaCIS.Application.Contracts
public string UserName { get; set; } = String.Empty;
}
+ public class TrialUserBasicInfo
+ {
+ public Guid UserTypeId { get; set; }
+
+ public string UserName { get; set; }
+
+ public string FullName { get; set; }
+
+ public Guid UserId { get; set; }
+ }
+
public class TrialMaintenanceDTO : UserTrialCommand
{
//[JsonIgnore]
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index 314e578c2..1881baa25 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -9,6 +9,7 @@ using IRaCIS.Core.Application.Service;
using Microsoft.AspNetCore.Authorization;
using IRaCIS.Core.Application.Auth;
using IRaCIS.Core.Application.Contracts;
+using DocumentFormat.OpenXml.Office2010.ExcelAc;
namespace IRaCIS.Application.Services
{
@@ -61,8 +62,13 @@ namespace IRaCIS.Application.Services
//}
#endregion
-
-
+ [HttpGet]
+ public async Task> GetTrialUserList(Guid trialId)
+ {
+ return await _trialUseRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
+ .Select(t => new TrialUserBasicInfo() { FullName = t.User.FullName, UserId = t.UserId, UserTypeId = t.User.UserTypeId, UserName = t.User.UserName })
+ .ToListAsync();
+ }
///
/// Setting页面 获取项目参与人员列表