From 9571775343c8ebd9ae936cb4ebdcfedda691474f Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 31 Dec 2024 13:37:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E7=94=A8=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8F=82=E4=B8=8E=E4=BA=BA=E5=91=98=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SiteSurvey/TrialSiteSurveyService.cs | 24 +++++++++++++++++-- .../TrialSiteUser/TrialExternalUserService.cs | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) 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() { };