From b0b37b39fce3df5fb8a59b25e515c6adf7ea71ba Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 22 Mar 2022 10:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E4=BF=A1=E6=81=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E5=88=86=E9=85=8D=E7=8F=AD=E7=BA=A7=E7=B3=BB?=
 =?UTF-8?q?=E9=83=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoFresh/AllocationClass.js                  | 2 ++
 .../StuInfoFresh/StuInfoFreshService.cs                    | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js
index 7e505c382..fbcdcae12 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js	
@@ -210,10 +210,12 @@ var bootstrap = function ($, learun) {
 
     };
     getParam = function () {
+        var deptNo = $("#DeptNo").lrselectGet();
         var majorNo = $("#MajorNo").lrselectGet();
         var IdCard = $("#IDCard").val();
         var isAllocation = $("#isAllocation").find('input:checked').val();
         var param = {
+            DeptNo: deptNo,
             MajorNo: majorNo,
             IDCard: IdCard,
             IsAllocation: isAllocation
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs
index 187bde2fb..564490085 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs	
@@ -160,7 +160,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
 
                 var data = this.BaseRepository("CollegeMIS").FindList<StuInfoFreshEntity>(strSql.ToString(), dp);
-                
+
                 return data;
             }
             catch (Exception ex)
@@ -289,6 +289,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Grade", '%' + queryParam["Grade"].ToString() + '%', DbType.String);
                 }
                 //分配班级
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.DeptNo = @DeptNo ");
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     strSql.Append(" and t.MajorNo = @MajorNo ");