外部用户发送邮件bug修改

2022-03-30 14:07:59 +08:00
parent 48e273d4af
commit 53774d8856
5 changed files with 20 additions and 9 deletions
@@ -34,7 +34,7 @@ namespace IRaCIS.Core.Application.AutoMapper
                   .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode));

            CreateMap<TrialSiteUserSurvey, TrialSiteUserSurveyView>()
-                 .ForMember(t => t.TrialRoleName, u => u.MapFrom(d => d.TrialRoleName.Value))
+              .ForMember(t => t.TrialRoleName, u => u.MapFrom(d => d.TrialRoleName.Value))
             .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName));


@@ -61,7 +61,10 @@ namespace IRaCIS.Core.Application.AutoMapper



-            CreateMap<TrialSiteUserSurvey, TrialSiteUserSurveyAllDTO>().ForMember(t=>t.TrialSiteSurvey,u=>u.MapFrom(c=>c.TrialSiteSurvey));
+            CreateMap<TrialSiteUserSurvey, TrialSiteUserSurveyAllDTO>()
+                .ForMember(t=>t.TrialSiteSurvey,u=>u.MapFrom(c=>c.TrialSiteSurvey))
+                 .ForMember(t => t.TrialRoleName, u => u.MapFrom(d => d.TrialRoleName.Value))
+             .ForMember(d => d.UserType, u => u.MapFrom(s => s.UserTypeRole.UserTypeShortName));



@@ -127,6 +127,7 @@ namespace IRaCIS.Core.Application.Service
                    addEntity.IsSystemUser = false;
                    addEntity.SystemUserId = newAddUser.Id;

+                    await _trialExternalUseRepository.SaveChangesAsync();

                }

@@ -151,7 +152,6 @@ namespace IRaCIS.Core.Application.Service
                    });
                }

-                await _trialExternalUseRepository.SaveChangesAsync();

                return ResponseOutput.Ok(addEntity.Id.ToString());

@@ -38,7 +38,7 @@ namespace IRaCIS.Application.Services
                .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName), t => (t.User.LastName + " / " + t.User.FirstName).Contains(param.UserRealName))
                .ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider);

-            return await query.ToPagedListAsync(param.PageIndex,param.PageSize, string.IsNullOrWhiteSpace(param.SortField) ? "UpdateTime" : param.SortField, param.Asc);
+            return await query.ToPagedListAsync(param.PageIndex, param.PageSize, string.IsNullOrWhiteSpace(param.SortField) ? "UpdateTime" : param.SortField, param.Asc);

        }

@@ -60,7 +60,7 @@ namespace IRaCIS.Application.Services

            return await query.ToPagedListAsync(param.PageIndex,
                param.PageSize, string.IsNullOrWhiteSpace(param.SortField) ? "UpdateTime" : param.SortField, param.Asc);
-      
+
        }


@@ -96,11 +96,11 @@ namespace IRaCIS.Application.Services
        {
            var addArray = _mapper.Map<TrialUser[]>(userTrialCommands);

-            await _repository.AddRangeAsync(addArray);
+            var trialUsers = await _trialUseRepository.AddRangeAsync(addArray);

-            foreach (var item in addArray)
+            foreach (var item in trialUsers)
            {
-                item.JoinTime = item.CreateTime;
+                item.JoinTime = DateTime.Now;
            }


@@ -115,7 +115,7 @@ namespace IRaCIS.Application.Services
        [HttpPut]
        public async Task<IResponseOutput> UpdateTrialUser(UpdateTrialUserCommand updateTrialUserCommand)
        {
-            var trialUser = await _trialUseRepository.Where(t => t.Id == updateTrialUserCommand.Id,true,true).FirstOrDefaultAsync();
+            var trialUser = await _trialUseRepository.Where(t => t.Id == updateTrialUserCommand.Id, true, true).FirstOrDefaultAsync();

            if (trialUser == null) return Null404NotFound(trialUser);