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(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 ");