修改项目用户

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -472,8 +472,13 @@ namespace IRaCIS.Application.Contracts
 
     public class TrialUserAddCommand
     {
+        [NotDefault]
+        public Guid IdentityUserId { get; set; }
+
+        [NotDefault]
         public Guid UserId { get; set; }
 
+        [NotDefault]
         public Guid TrialId { get; set; }
 
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -165,19 +165,47 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput> AddTrialUsers(TrialUserAddCommand[] userTrialCommands)
         {
 
-            var addArray = _mapper.Map<TrialUserRole[]>(userTrialCommands);
+            foreach (var item in userTrialCommands.GroupBy(t => t.IdentityUserId))
-
-            var trialUsers = await _trialUseRoleRepository.AddRangeAsync(addArray);
-
-            foreach (var item in trialUsers)
             {
-                item.JoinTime = DateTime.Now;
+                var currentUserRoleList = item.ToList();
+
+                var first = currentUserRoleList.FirstOrDefault();
+
+                var findTrialuser = await _trialIdentityUserRepository.Where(t => t.TrialId == first.TrialId && t.IdentityUserId == item.Key, true, true).Include(t => t.TrialUserRoleList).FirstOrDefaultAsync();
+
+                if (findTrialuser == null)
+                {
+                    var currentUser = new TrialIdentityUser()
+                    {
+                        TrialId = first.TrialId,
+                        IdentityUserId = item.Key,
+                        JoinTime = DateTime.Now,
+                        TrialUserRoleList = currentUserRoleList.Select(t => new TrialUserRole() { UserId = t.UserId, TrialId = t.TrialId }).ToList()
+                    };
+
+
+                    await _trialIdentityUserRepository.AddAsync(currentUser);
+                }
+                else
+                {
+                    if (findTrialuser.IsDeleted == true)
+                    {
+                        findTrialuser.IsDeleted = false;
+                        findTrialuser.DeletedTime = null;
+                        findTrialuser.JoinTime = DateTime.Now;
+                        findTrialuser.RemoveTime = null;
+                    }
+
+                    findTrialuser.TrialUserRoleList.AddRange(currentUserRoleList.Select(t => new TrialUserRole() { UserId = t.UserId, TrialId = t.TrialId, TrialUserId = findTrialuser.Id }).ToList());
+                }
+
+
+
+                var success = await _trialIdentityUserRepository.SaveChangesAsync();
+
             }
 
-
+            return ResponseOutput.Ok();
-            var success = await _trialUseRoleRepository.SaveChangesAsync();
-
-            return ResponseOutput.Result(success);
         }