From b25dec68cbdebb52531149d96d30b8d56ff5b02c Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 27 Mar 2025 10:55:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingCriterion/ReadingQuestionService.cs      | 13 +++++++++++--
 .../Service/TrialSiteUser/TrialService.cs           | 12 ++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index 28ff5acdb..cdcc2c8c7 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -961,6 +961,10 @@ namespace IRaCIS.Core.Application.Service
                     {
                         question.RelevanceId = copyNewQuestionList.Where(y => x.RelevanceId == y.OriginalId).Select(y => y.Id).FirstOrDefault();
                     }
+                    if (question.GroupId != null)
+                    {
+                        question.GroupId = copyNewQuestionList.Where(y => x.GroupId == y.OriginalId).Select(y => y.Id).FirstOrDefault();
+                    }
                     needAddDatas.Add(question);
                 };
 
@@ -977,7 +981,8 @@ namespace IRaCIS.Core.Application.Service
                     var tableQuestion = x.Clone();
                     tableQuestion.SystemCriterionId = inDto.NewSystemCriterionId;
                     tableQuestion.Id = NewId.NextGuid();
-                    if (tableQuestion.ParentId != null)
+                    tableQuestion.ReadingQuestionId = copyNewQuestionList.Where(y => x.ReadingQuestionId == y.OriginalId).Select(y => y.Id).FirstOrDefault();
+                if (tableQuestion.ParentId != null)
                     {
                         tableQuestion.ParentId = copeNewSystemTableQuestionList.Where(y => x.ParentId == y.OriginalId).Select(y => y.Id).FirstOrDefault();
                     }
@@ -989,7 +994,11 @@ namespace IRaCIS.Core.Application.Service
                     {
                         tableQuestion.DependParentId = copeNewSystemTableQuestionList.Where(y => x.DependParentId == y.OriginalId).Select(y => y.Id).FirstOrDefault();
                     }
-                    needAddTableDatas.Add(tableQuestion);
+                    if (tableQuestion.ClassifyTableQuestionId != null)
+                    {
+                        tableQuestion.ClassifyTableQuestionId = copeNewSystemTableQuestionList.Where(y => x.ClassifyTableQuestionId == y.OriginalId).Select(y => y.Id).FirstOrDefault();
+                    }
+                needAddTableDatas.Add(tableQuestion);
                 }
                 await _readingTableQuestionSystemRepository.BatchDeleteNoTrackingAsync(x => x.SystemCriterionId == inDto.NewSystemCriterionId);
                 await _readingTableQuestionSystemRepository.AddRangeAsync(needAddTableDatas);
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
index e9768e61e..4b554b70b 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
@@ -105,11 +105,15 @@ namespace IRaCIS.Core.Application.Service
         //过滤废除的项目
         public async Task<List<TrialSelectDTO>> GetTrialSelect()
         {
+
+            List<int> sap = new List<int>() { (int)UserTypeEnum.SuperAdmin, (int)UserTypeEnum.Admin, (int)UserTypeEnum.OP };
+
+            List<int> sapp = new List<int>() { (int)UserTypeEnum.SuperAdmin, (int)UserTypeEnum.Admin, (int)UserTypeEnum.OP, (int)UserTypeEnum.ProjectManager };
+
             return await _trialRepository.AsQueryable()
-                 .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP,
-                t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId)) && t.IsDeleted == false)
-                .Where(t=>t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId))
-                && (t.TrialStatusStr != StaticData.TrialState.TrialStopped || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager))
+                .WhereIf(sap.Contains(_userInfo.UserTypeEnumInt),x=>x.TrialStatusStr != StaticData.TrialState.TrialStopped)
+                .WhereIf(_userInfo.UserTypeEnumInt== (int)UserTypeEnum.ProjectManager,t=> t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId)))
+                .WhereIf(!sapp.Contains(_userInfo.UserTypeEnumInt), t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId))&& t.TrialStatusStr != StaticData.TrialState.TrialStopped)
                 .ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).ToListAsync();
         }