From 7a17f32833048302da199cd11bc32748272ddb07 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Tue, 25 Apr 2023 17:13:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8A=A1=E7=AE=A1=E7=90=86-=E5=AE=89?=
 =?UTF-8?q?=E6=8E=92=E6=95=99=E5=B8=88=20=E6=8E=92=E9=99=A4=E5=B7=B2?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E6=95=99=E5=B8=88=E6=8A=A5=E9=94=99=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=B7=B2=E5=88=86=E9=85=8D=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Exam_InvigilateTeacherService.cs          | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs
index f1d448514..27ca50651 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs	
@@ -72,7 +72,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         strSql.Append($" AND t.Semester = '{ELEntity.Semester}' ");
                     }
                     //同一考试课程下考场的监考老师不重复
-                    var empSql = "SELECT DISTINCT EPLId, STUFF( (SELECT ',' + empno FROM Exam_ExamPlanRoom WHERE 1=1 ";
+                    var empSql = "SELECT STUFF( (SELECT ',' + empno FROM Exam_ExamPlanRoom WHERE 1=1 ";
                     if (!queryParam["EPRId"].IsEmpty())
                     {
                         empSql += $" and EPRId<>'{queryParam["EPRId"].ToString()}'";
@@ -81,10 +81,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     empSql += $@"  and EPLId = T.EPLId FOR XML PATH('') ), 1, 1, '') AS empno FROM Exam_ExamPlanRoom AS T
                     where EPLId ='{queryParam["EPLId"].ToString()}'";
                     var obj = this.BaseRepository("CollegeMIS").FindList<Exam_ExamPlanRoomEntity>(empSql).Select(x => x.EmpNo).Distinct().ToList();
-                    if (obj != null && obj.Count > 0)
+                    if (!string.IsNullOrEmpty(obj[0]))
                     {
+                        //if (obj[0].IsEmpty())
+                        //{
                         var empNo = string.Join("','", obj[0].ToString().Split(',').Distinct());
                         strSql.Append($" AND t.EmpNo not in ('{empNo}')");
+                        //}
                     }
 
                     //筛选掉考试时间冲突的老师和专业课的代课老师
@@ -133,7 +136,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             //此处判断当前考场时间是否在考试课程排考时间的开始前30分钟到结束后30分钟
                             if ((examRoomTime1 >= examtimeStart.AddMinutes(-30) && examRoomTime1 <= examtimeEnd.AddMinutes(30)) || (examRoomTime2 >= examtimeStart.AddMinutes(-30) && examRoomTime2 <= examtimeEnd.AddMinutes(30)))
                             {
-                                empnos.Add(examRoom.EmpNo);
+                                if (examRoom.EmpNo.Contains(','))
+                                {
+                                    var ss = examRoom.EmpNo.Split(',');
+                                    foreach (var item in ss)
+                                    {
+                                        empnos.Add(item);
+                                    }
+                                }
+                                else
+                                {
+                                    empnos.Add(examRoom.EmpNo);
+                                }
+
                             }
                         }
                         if (empnos.Count() > 0)