修改用户临时提交

2024-12-25 11:25:45 +08:00
parent 26cba15742
commit a6080b76b1
17 changed files with 297 additions and 152 deletions
@@ -189,27 +189,34 @@ namespace IRaCIS.Core.Application.Service
        /// <returns></returns>
        public async Task<IResponseOutput> UserTrialUser([FromServices] IRepository<TrialIdentityUser> _trialIdentityUserRepository, [FromServices] IRepository<TrialUserRole> _trialUserRoleReposiotry)
        {
-            var list = _trialUserRoleReposiotry.Where().Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.JoinTime, t.RemoveTime }).ToList();
+            var list = _trialUserRoleReposiotry.Where().Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.UserId, t.JoinTime, t.RemoveTime }).ToList();


            foreach (var item in list.GroupBy(t => new { t.IdentityUserId, t.TrialId }))
            {
+
+                var id = NewId.NextSequentialGuid();
+
                var userRoleList = item.ToList();

+                var userIdList = item.Select(t => t.UserId).ToList();
+
                var first = userRoleList.First();

                var haveJoin = userRoleList.Any(t => t.JoinTime != null);

                if (haveJoin)
                {
-                    await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser() { IdentityUserId = item.Key.IdentityUserId, TrialId = item.Key.TrialId, JoinTime = userRoleList.Min(t => t.JoinTime) });
+                    await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser() { Id = id, IdentityUserId = item.Key.IdentityUserId, TrialId = item.Key.TrialId, JoinTime = userRoleList.Min(t => t.JoinTime) });

                }
                else
                {
-                    await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser() { IdentityUserId = item.Key.IdentityUserId, TrialId = item.Key.TrialId, RemoveTime = userRoleList.Max(t => t.RemoveTime) });
+                    await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser() { Id = id, IdentityUserId = item.Key.IdentityUserId, TrialId = item.Key.TrialId, RemoveTime = userRoleList.Max(t => t.RemoveTime) });
                }

+                await _trialUserRoleReposiotry.BatchUpdateNoTrackingAsync(t => t.TrialId == item.Key.TrialId && userIdList.Contains(t.UserId), u => new TrialUserRole() { TrialUserId = id });
+
            }

            await _trialIdentityUserRepository.SaveChangesAsync();