From 78053ec29ac6d1d09cef0d9a0e823e7f638a7f26 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Fri, 26 Aug 2022 17:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=A1=A5?=
 =?UTF-8?q?=E8=80=83=E5=90=8D=E5=8D=95/=E9=87=8D=E4=BF=AE=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=AD=A6=E5=88=B6=E6=98=AF=E2=80=98=E5=BC=B9?=
 =?UTF-8?q?=E6=80=A7=E5=AD=A6=E5=88=B6=E2=80=99=E7=9A=84=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=AD=A6=E7=B1=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=87=8C=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E4=B9=9F?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StuScoreNotPass/StuScoreNotPassService.cs                 | 4 +++-
 .../StuScoreNotPassTwo/StuScoreNotPassTwoService.cs           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs
index b458b8d29..a1de116d8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs	
@@ -195,7 +195,9 @@ left join ClassInfo c on c.ClassNo=a.ClassNo
 left join StuInfoBasic b on b.StuNo=a.StuNo
 where 1=1 and a.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus =1)
 and a.LessonSortNo='1'
-and a.Score<60 ");
+and a.Score<60
+and b.StuId is not null
+and (b.EduSystem is null or b.EduSystem != '6') ");
 
                 if (!queryParam["AcademicYearNo"].IsEmpty())
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs
index fbc6fb792..f0ae6cf25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs	
@@ -288,7 +288,9 @@ left join StuInfoBasic b on b.StuNo = a.StuNo
 where 1 = 1
 and a.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus = 1)
 and a.LessonSortNo = '1'
-and a.Score < 60");
+and a.Score < 60
+and b.StuId is not null
+and (b.EduSystem is null or b.EduSystem != '6') ");
 
                 if (!queryParam["AcademicYearNo"].IsEmpty())
                 {