合并

2025-12-24 16:27:53 +08:00
parent 8ccc25e074 bad212d859
commit 4f79c39f31
34 changed files with 2920 additions and 100 deletions
@@ -808,11 +808,15 @@ namespace WebAPI.Controllers
            var responeData = new Model.ResponeData();
            try
            {
+                var trainingIds = Funs.DB.EduTrain_TrainRecord.Where(x => projectId == projectId).Select(x => x.TrainingId).ToList();
+                var personIds = Funs.DB.EduTrain_TrainRecordDetail.Where(x => trainingIds.Contains(x.TrainingId)).Select(x=>x.PersonId).ToList(); ; 
+
                responeData.data = (from x in Funs.DB.SitePerson_Person
                                    join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
-                                    join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard
+                                    join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard                                   
                                    where x.ProjectId == projectId && !x.ExchangeTime.HasValue
                                   && x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null
+                                    where personIds.Contains(x.PersonId)
                                    select new
                                    {
                                        x.PersonId,