diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 8ded0154e..d8aebca1a 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -906,7 +906,7 @@ namespace IRaCIS.Core.Application.Contracts generateUser.Password = MD5Helper.Md5(IRCEmailPasswordHelper.GenerateRandomPassword(10)); - generateUser.Status = UserStateEnum.Disable; + generateUser.Status = UserStateEnum.Enable; generateUser.UserRoleList = new List() { }; @@ -965,6 +965,16 @@ namespace IRaCIS.Core.Application.Contracts //有该人员 //是否有该角色 + + if (findTrialUser.IsDeleted == true) + { + findTrialUser.IsDeleted = false; + findTrialUser.DeletedTime = null; + findTrialUser.RemoveTime = null; + findTrialUser.JoinTime = DateTime.Now; + } + + foreach (var userTypeId in userTypeIdList) { var findTrialUserRole = findTrialUser.TrialUserRoleList.Where(t => t.UserRole.UserTypeId == userTypeId).FirstOrDefault(); @@ -1099,7 +1109,7 @@ namespace IRaCIS.Core.Application.Contracts generateUser.Password = MD5Helper.Md5(IRCEmailPasswordHelper.GenerateRandomPassword(10)); - generateUser.Status = UserStateEnum.Disable; + generateUser.Status = UserStateEnum.Enable; generateUser.UserRoleList = new List() { }; @@ -1158,6 +1168,16 @@ namespace IRaCIS.Core.Application.Contracts //有该人员 //是否有该角色 + if (findTrialUser.IsDeleted == true) + { + findTrialUser.IsDeleted = false; + findTrialUser.DeletedTime = null; + findTrialUser.RemoveTime = null; + findTrialUser.JoinTime = DateTime.Now; + } + + + foreach (var userTypeId in userTypeIdList) { var findTrialUserRole = findTrialUser.TrialUserRoleList.Where(t => t.UserRole.UserTypeId == userTypeId).FirstOrDefault(); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs index 3d3064922..80b766af9 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs @@ -277,7 +277,7 @@ namespace IRaCIS.Core.Application.Service generateUser.Password = MD5Helper.Md5(IRCEmailPasswordHelper.GenerateRandomPassword(10)); - generateUser.Status = UserStateEnum.Disable; + generateUser.Status = UserStateEnum.Enable; generateUser.UserRoleList = new List() { };