From 4f439a02f697c184cd282a6014437ed4fb119669 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Mon, 4 Jan 2021 17:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=BF=8E?=
 =?UTF-8?q?=E6=96=B0=E7=B3=BB=E7=BB=9F=EF=BC=88=E9=87=91=E9=9A=85=EF=BC=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8B=E5=8A=9F=E8=83=BD=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=B3=BB=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/StuEnrollController.cs        | 30 ++++------
 .../Views/StuEnroll/AllocationClass.cshtml    | 21 -------
 .../Views/StuEnroll/AllocationClass.js        | 58 +------------------
 .../StuEnroll/AllocationDormitory.cshtml      |  7 ---
 .../Views/StuEnroll/AllocationDormitory.js    | 22 -------
 .../Views/StuEnroll/CheckIn.cshtml            |  4 --
 .../Views/StuEnroll/CheckIn.js                | 26 +--------
 .../Views/StuEnroll/Form.cshtml               |  4 --
 .../Views/StuEnroll/Form.js                   | 22 -------
 .../Views/StuEnroll/GetArticles.cshtml        |  4 --
 .../Views/StuEnroll/GetArticles.js            | 23 --------
 .../Views/StuEnroll/GetCloth.cshtml           |  4 --
 .../Views/StuEnroll/GetCloth.js               | 23 --------
 .../Views/StuEnroll/GetClothSize.cshtml       |  4 --
 .../Views/StuEnroll/GetClothSize.js           | 24 +-------
 .../Views/StuEnroll/Index.cshtml              |  4 --
 .../Views/StuEnroll/Index.js                  | 38 +-----------
 .../Views/StuEnroll/IsHelp.cshtml             |  4 --
 .../Views/StuEnroll/IsHelp.js                 | 25 --------
 .../Views/StuEnroll/IsPay.cshtml              | 10 +---
 .../Views/StuEnroll/IsPay.js                  | 23 --------
 .../Views/StuEnroll/IsPhoto.cshtml            |  6 +-
 .../Views/StuEnroll/IsPhoto.js                | 32 ++--------
 .../Views/StuEnroll/Military.cshtml           |  4 --
 .../Views/StuEnroll/Military.js               | 25 --------
 .../Views/StuEnroll/NewAllocationDormitory.js | 11 +---
 .../Views/StuEnroll/PayAfter.cshtml           |  4 --
 .../Views/StuEnroll/PayAfter.js               | 25 --------
 .../Views/StuEnroll/Report.cshtml             |  4 --
 .../Views/StuEnroll/Report.js                 | 23 --------
 .../Views/StuEnroll/StudentStatus.cshtml      |  4 --
 .../Views/StuEnroll/StudentStatus.js          | 28 +--------
 .../StuEnroll/StuEnrollBLL.cs                 | 31 ++--------
 .../StuEnroll/StuEnrollEntity.cs              |  5 --
 .../StuEnroll/StuEnrollIBLL.cs                |  7 +--
 .../StuEnroll/StuEnrollService.cs             | 53 +----------------
 36 files changed, 39 insertions(+), 603 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs
index 68591a54d..3d8f5b82d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs	
@@ -314,13 +314,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 if (string.IsNullOrEmpty(student.PhotoUrl))
                 {
                     student.PhotoUrl = Guid.NewGuid().ToString();
-                    stuEnrollIBLL.SaveEntity(student.StuId,student);
+                    stuEnrollIBLL.SaveEntity(student.StuId, student);
                 }
 
                 var annexEntity = annexesFileIBLL.GetEntityByFolderId(student.PhotoUrl);
                 if (annexEntity == null)
                 {
-                    annexEntity=new AnnexesFileEntity();
+                    annexEntity = new AnnexesFileEntity();
                     annexEntity.Create();
                     annexEntity.F_Id = Guid.NewGuid().ToString();
                 }
@@ -344,11 +344,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetYearListByClass()
         {
             var classList = classInfoIBLL.GetAllClass().ToList();
-            var result = classList.GroupBy(a => a.Grade).Select(m=>m.Key).ToList();
-            List<object> list=new List<object>();
+            var result = classList.GroupBy(a => a.Grade).Select(m => m.Key).ToList();
+            List<object> list = new List<object>();
             foreach (var item in result)
             {
-                list.Add(new{year=item});
+                list.Add(new { year = item });
             }
 
             return Success(list);
@@ -375,9 +375,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
         [HttpPost]
         [AjaxOnly]
-        public ActionResult GetCheckInStatistics(string DeptNo, string MajorNo, string ClassNo)
+        public ActionResult GetCheckInStatistics(string MajorNo, string ClassNo)
         {
-            var result = stuEnrollIBLL.GetCheckInStatistics(DeptNo, MajorNo, ClassNo);
+            var result = stuEnrollIBLL.GetCheckInStatistics(MajorNo, ClassNo);
             return Success(result);
 
         }
@@ -385,18 +385,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
         [HttpPost]
         [AjaxOnly]
-        public ActionResult GetHelpStatistics(string DeptNo, string MajorNo, string ClassNo)
+        public ActionResult GetHelpStatistics(string MajorNo, string ClassNo)
         {
-            var result = stuEnrollIBLL.GetHelpStatistics(DeptNo, MajorNo, ClassNo);
+            var result = stuEnrollIBLL.GetHelpStatistics(MajorNo, ClassNo);
             return Success(result);
 
         }
 
         [HttpPost]
         [AjaxOnly]
-        public ActionResult GetMilitaryStatistics(string DeptNo, string MajorNo, string ClassNo)
+        public ActionResult GetMilitaryStatistics(string MajorNo, string ClassNo)
         {
-            var result = stuEnrollIBLL.GetMilitaryStatistics(DeptNo, MajorNo, ClassNo);
+            var result = stuEnrollIBLL.GetMilitaryStatistics(MajorNo, ClassNo);
             return Success(result);
 
         }
@@ -519,13 +519,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("分配成功！");
 
         }
-        [HttpPost]
-        [AjaxOnly]
-        public ActionResult SyncDept()
-        {
-            stuEnrollIBLL.SyncDept();
-            return Success("同步成功");
-        }
+       
         [HttpPost]
         [AjaxOnly]
         public ActionResult SyncMajor()
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.cshtml
index b438c7a7d..9ca53abf6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.cshtml	
@@ -57,13 +57,6 @@
 
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div style="width:200px;" class="lr-form-item">
-                            <div class="lr-form-item-title">系部</div>
-                            <div id="DeptNo"></div>
-                        </div>
-
-                    </div>
                     <div class="lr-layout-tool-item">
                         <div style="width:200px;" class="lr-form-item">
                             <div class="lr-form-item-title">专业</div>
@@ -88,13 +81,6 @@
 
                 </div>
                 <!--<div class="lr-layout-tool-right">
-                    <div class="lr-layout-tool-item">
-                        <div style="width:200px;" class="lr-form-item">
-                            <div class="lr-form-item-title">系部</div>
-                            <div id="DeptNo"></div>
-                        </div>
-
-                    </div>
                     <div class="lr-layout-tool-item">
                         <div style="width:200px;" class="lr-form-item">
                             <div class="lr-form-item-title">专业</div>
@@ -116,13 +102,6 @@
         </div>
         <div class="distribute">
             <div class="lr-layout-tool-left">
-                <div class="lr-layout-tool-item">
-                    <div style="width:200px;" class="lr-form-item">
-                        <div class="lr-form-item-title">系部</div>
-                        <div id="DeptNoAll"></div>
-                    </div>
-
-                </div>
                 <div class="lr-layout-tool-item">
                     <div style="width:200px;" class="lr-form-item">
                         <div class="lr-form-item-title">专业</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js
index dba4d2c34..075abdcf2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js	
@@ -25,29 +25,6 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
 
 
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -57,29 +34,6 @@ var bootstrap = function ($, learun) {
             });
 
 
-
-            $('#DeptNoAll').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNoAll').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNoAll').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNoAll').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -111,18 +65,10 @@ var bootstrap = function ($, learun) {
             });
 
 
-            //$('#MajorNo').on("click",
-            //    function () {
-            //        var data = $('#DeptNo').lrselectGet();
-            //        if (!data) {
-            //            learun.alert.error('请先选择系');
-            //        }
-            //    });
             //$('#ClassNo').on("click",
             //    function () {
-            //        var data1 = $('#DeptNo').lrselectGet();
             //        var data2 = $('#MajorNo').lrselectGet();
-            //        if (!data1 || !data2) {
+            //        if (!data2) {
             //            learun.alert.error('请先选择系和专业');
             //        }
             //    });
@@ -299,12 +245,10 @@ 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.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.cshtml
index 229879426..b2ba82f11 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.cshtml	
@@ -17,13 +17,6 @@
 
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div style="width:200px;" class="lr-form-item">
-                            <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-                            <div id="DeptNo"></div>
-                        </div>
-
-                    </div>
                     <div class="lr-layout-tool-item">
                         <div style="width:200px;" class="lr-form-item">
                             <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js
index 11302c109..35cd858ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js	
@@ -24,28 +24,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.cshtml
index 5a7f484cc..2fdc968f0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js
index 3e05f6b4b..6da146ce8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js	
@@ -24,29 +24,7 @@ var bootstrap = function ($, learun) {
                 value:"year",
                 text:"year",
             })
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
+            
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -318,13 +296,11 @@ var bootstrap = function ($, learun) {
             page.search();
         },
         refreshMoney: function () {
-            var deptNo = $("#DeptNo").lrselectGet();
             var majorNo = $("#MajorNo").lrselectGet();
             var classNo = $("#ClassNo").lrselectGet();
             $.post(
                 top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetCheckInStatistics',
                 {
-                    DeptNo: deptNo,
                     MajorNo: majorNo,
                     ClassNo: classNo
                 },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.cshtml
index a91112c3a..8e14bbf3a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.cshtml	
@@ -143,10 +143,6 @@
         <div class="lr-form-item-title">录取方式<font face="宋体">*</font></div>
         <div id="Admissions" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuEnroll">
-        <div class="lr-form-item-title">系部</div>
-        <div id="DeptNo" class="form-control"></div>
-    </div>
 
     <div class="col-xs-4 lr-form-item" data-table="StuEnroll">
         <div class="lr-form-item-title">专业</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js
index ceaac9785..7b6ac3760 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js	
@@ -24,28 +24,6 @@ var bootstrap = function ($, learun) {
             $('#Nationals').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             //政治面貌
             $('#Political').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
-             $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.cshtml
index b7c63504a..07f5d7d83 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js
index fbeee4821..4b0e8f29f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js	
@@ -22,29 +22,6 @@ var bootstrap = function ($, learun) {
                 value:"year",
                 text:"year",
             })
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.cshtml
index 5677d444e..7f54249c2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js
index 8b37576d8..d9d6e92d4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js	
@@ -22,29 +22,6 @@ var bootstrap = function ($, learun) {
                 value:"year",
                 text:"year",
             })
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.cshtml
index b82cd0eb5..65650d183 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js
index 80813a07d..283864c8a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js	
@@ -22,29 +22,7 @@ var bootstrap = function ($, learun) {
                 value: "year",
                 text: "year",
             })
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
+            
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml
index ca74e6a86..f4874ae4b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js
index 85145bfff..8290184e4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js	
@@ -27,28 +27,6 @@ var bootstrap = function ($, learun) {
                     }
                 });
 
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -170,9 +148,7 @@ var bootstrap = function ($, learun) {
 
             // 同步系部
             $('#lr_syn').on('click', function () {
-                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/SyncDept', function () {
-                    refreshGirdData();
-                });
+                
             });
             // 同步专业
             $('#lr_synmajor').on('click', function () {
@@ -300,18 +276,6 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
-                    {
-                        label: "系部", name: "DeptNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml
index 503d4a4db..4be727241 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js
index 05e42e22c..00091cba8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js	
@@ -24,29 +24,6 @@ var bootstrap = function ($, learun) {
                 value:"year",
                 text:"year",
             })
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -349,13 +326,11 @@ var bootstrap = function ($, learun) {
             page.search();
         },
         refreshMoney: function () {
-            var deptNo = $("#DeptNo").lrselectGet();
             var majorNo = $("#MajorNo").lrselectGet();
             var classNo = $("#ClassNo").lrselectGet();
             $.post(
                 top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetHelpStatistics',
                 {
-                    DeptNo: deptNo,
                     MajorNo: majorNo,
                     ClassNo: classNo
                 },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml
index 5235b7d12..d5d89594b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml	
@@ -83,10 +83,6 @@
 					<div class="lr-layout-tool-item">
 						<div id="multiple_condition_query">
 							<div class="lr-query-formcontent">
-								<div class="col-xs-12 lr-form-item">
-									<div class="lr-form-item-title">系</div>
-									<div id="DeptNo"></div>
-								</div>
 								<div class="col-xs-12 lr-form-item">
 									<div class="lr-form-item-title">专业</div>
 									<div id="MajorNo"></div>
@@ -151,7 +147,6 @@
 		name: "薛礼根",
 		id: "14060219930602****",
 		type: "汉族",
-		system: "数学系",
 		major: "数学与应用数学",
 		class: "1301",
 		bookPay: {
@@ -182,7 +177,6 @@
 				data.major = res.data.majorName;
 				data.type = $("#gridtable").jfGridValue('Nationals');
 				data.class = res.data.className;
-				data.system = res.data.deptName;
 				data.teacher = res.data.teacherName;
 				data.teacherPhone = res.data.teacherMobile;
 				var chagerItemList = '';
@@ -212,8 +206,8 @@
 					'<tr>' +
 					'<td>民族</td>' +
 					'<td colspan="2">' + data.type + '</td>' +
-					'<td>系部</td>' +
-					'<td colspan="2">' + data.system + '</td>' +
+					'<td></td>' +
+					'<td colspan="2"></td>' +
 					'</tr>' +
 					'<tr>' +
 					'<td>专业</td>' +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js
index 691929fc6..f77e662e0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js	
@@ -23,29 +23,6 @@ var bootstrap = function ($, learun) {
                 value: "year",
                 text: "year",
             })
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.cshtml
index cdb1d9400..09c645a2c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.cshtml	
@@ -10,11 +10,7 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
+                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
                                 </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js
index 14a49d27d..912ca643b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js	
@@ -19,33 +19,11 @@ var bootstrap = function ($, learun) {
             }, 380, 400);
             $("#IsMug").lrDataItemSelect({ code: "jyYewOrNot" });
             $('#Year').lrselect({
-                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
-                value:"year",
-                text:"year",
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
             })
 
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -104,7 +82,7 @@ var bootstrap = function ($, learun) {
             });
 
             //关联照片
-            $("#lr_realationPhoto").on('click', function() {
+            $("#lr_realationPhoto").on('click', function () {
                 learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/RealationPhoto', {}, function () {
                     refreshGirdData();
                 });
@@ -197,7 +175,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } },
+                    { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val != null && val != "" ? val.substring(0, 10) : ""; } },
                     { label: "身份证", name: "IDCard", width: 100, align: "left" },
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.cshtml
index d75e406b5..3cf4b990c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js
index 99bc91916..4534d5242 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js	
@@ -24,29 +24,6 @@ var bootstrap = function ($, learun) {
                 value:"year",
                 text:"year",
             })
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -327,13 +304,11 @@ var bootstrap = function ($, learun) {
             page.search();
         },
         refreshMoney: function () {
-            var deptNo = $("#DeptNo").lrselectGet();
             var majorNo = $("#MajorNo").lrselectGet();
             var classNo = $("#ClassNo").lrselectGet();
             $.post(
                 top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetMilitaryStatistics',
                 {
-                    DeptNo: deptNo,
                     MajorNo: majorNo,
                     ClassNo: classNo
                 },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js
index 60e23969b..06e0d3e22 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationDormitory.js	
@@ -64,19 +64,10 @@ var bootstrap = function ($, learun) {
                 }
             });
 
-
-            //$('#MajorNo').on("click",
-            //    function () {
-            //        var data = $('#DeptNo').lrselectGet();
-            //        if (!data) {
-            //            learun.alert.error('请先选择系');
-            //        }
-            //    });
             //$('#ClassNo').on("click",
             //    function () {
-            //        var data1 = $('#DeptNo').lrselectGet();
             //        var data2 = $('#MajorNo').lrselectGet();
-            //        if (!data1 || !data2) {
+            //        if (!data2) {
             //            learun.alert.error('请先选择系和专业');
             //        }
             //    });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.cshtml
index dfe2eb733..0759da080 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js
index 1fbb443b0..12a8eeb78 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js	
@@ -24,29 +24,6 @@ var bootstrap = function ($, learun) {
                 value:"year",
                 text:"year",
             })
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -403,13 +380,11 @@ var bootstrap = function ($, learun) {
             page.search();
         },
         refreshMoney: function () {
-            var deptNo = $("#DeptNo").lrselectGet();
             var majorNo = $("#MajorNo").lrselectGet();
             var classNo = $("#ClassNo").lrselectGet();
             $.post(
                 top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetMilitaryStatistics',
                 {
-                    DeptNo: deptNo,
                     MajorNo: majorNo,
                     ClassNo: classNo
                 },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml
index 2b58f639f..c7a7c3c27 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js
index ec38c618d..9ac51a3cf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js	
@@ -24,29 +24,6 @@ var bootstrap = function ($, learun) {
             });
             $('#Admissions').lrDataItemSelect({ code: 'enrollType' });
 
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.cshtml
index 66e722f3f..1761ea601 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.cshtml	
@@ -10,10 +10,6 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js
index cca6f98c2..493c6d434 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js	
@@ -26,29 +26,7 @@ var bootstrap = function ($, learun) {
                         learun.alert.error('读取错误！未检测到身份证或设备连接错误,请调整身份证位置并重新读取，多次未读取到身份证信息则可能是身份证芯片已损坏！');
                     }
                 });
-
-            $('#DeptNo').lrselect({
-                allowSearch: true,
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
-                        });
-                    } else {
-                        $('#MajorNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "1=1 AND CheckMark=1" }
-                        });
-                    }
-
-                }
-            });
+            
             $('#MajorNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -146,9 +124,7 @@ var bootstrap = function ($, learun) {
 
             // 同步系部
             $('#lr_syn').on('click', function () {
-                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/SyncDept', function () {
-                    refreshGirdData();
-                });
+                
             });
             // 打印
             $('#lr_print').on('click', function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs
index b4b9898e7..2c85c9e1c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs	
@@ -152,11 +152,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
 
-        public object GetCheckInStatistics(string DeptNo, string MajorNo, string ClassNo)
+        public object GetCheckInStatistics(string MajorNo, string ClassNo)
         {
             try
             {
-                return stuEnrollService.GetCheckInStatistics(DeptNo, MajorNo, ClassNo);
+                return stuEnrollService.GetCheckInStatistics(MajorNo, ClassNo);
             }
             catch (Exception ex)
             {
@@ -170,11 +170,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-        public object GetHelpStatistics(string DeptNo, string MajorNo, string ClassNo)
+        public object GetHelpStatistics(string MajorNo, string ClassNo)
         {
             try
             {
-                return stuEnrollService.GetHelpStatistics(DeptNo, MajorNo, ClassNo);
+                return stuEnrollService.GetHelpStatistics(MajorNo, ClassNo);
             }
             catch (Exception ex)
             {
@@ -188,11 +188,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-        public object GetMilitaryStatistics(string DeptNo, string MajorNo, string ClassNo)
+        public object GetMilitaryStatistics(string MajorNo, string ClassNo)
         {
             try
             {
-                return stuEnrollService.GetMilitaryStatistics(DeptNo, MajorNo, ClassNo);
+                return stuEnrollService.GetMilitaryStatistics(MajorNo, ClassNo);
             }
             catch (Exception ex)
             {
@@ -432,25 +432,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-        public void SyncDept()
-        {
-            try
-            {
-                stuEnrollService.SyncDept();
-            }
-            catch (Exception ex)
-            {
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowBusinessException(ex);
-                }
-            }
-        }
-
         public void SyncMajor()
         {
             try
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs
index a0f6ea151..776cdf1d6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs	
@@ -381,11 +381,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("ENROLLGRADE")]
         public string EnrollGrade { get; set; }
         /// <summary>
-        /// 系部
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 应收金额
         /// </summary>
         [Column("PAYAMOUNT")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs
index 3313c1ab3..164d5a791 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs	
@@ -56,7 +56,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         (bool, string) Report(string stuId, bool status);
         (bool, string) Sign(string stuId, bool status);
-        void SyncDept();
         void SyncMajor();
         (bool, string) Stay(string stuId, bool status, bool payAfter);
         void AllStay();
@@ -79,9 +78,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         (bool, string) GetClothSize(string stuId, bool status);
         (bool, string) GetArticles(string stuId, bool status);
         object GetStuInfo(string stuId);
-        object GetCheckInStatistics(string DeptNo, string MajorNo, string ClassNo);
-        object GetHelpStatistics(string DeptNo, string MajorNo, string ClassNo);
-        object GetMilitaryStatistics(string DeptNo, string MajorNo, string ClassNo);
+        object GetCheckInStatistics(string MajorNo, string ClassNo);
+        object GetHelpStatistics(string MajorNo, string ClassNo);
+        object GetMilitaryStatistics(string MajorNo, string ClassNo);
         void GetMoney();
         void RelationPhoto();
         void Synchronization();
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs
index 95bc560b0..36aaca3c8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs	
@@ -95,7 +95,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.StuStatusNo,
                 t.PayAmount,
                 t.ActualPayAmount,
-                t.DeptNo,
                 t.Grade,
                 t.THROUGHPROJECT,
                 t.Status
@@ -131,11 +130,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Admissions",   queryParam["Admissions"].ToString() , DbType.String);
                     strSql.Append(" AND t.Admissions = @Admissions ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
@@ -373,7 +367,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.Name,
                 t.Address,
                 t.Campus,
-                t.Dept,
                 t.BuildType,
                 t.Major,
                 t.Class,
@@ -545,9 +538,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var stuEnroll = this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(a => a.StuId == stuId);
                 var majorInfo = this.BaseRepository("CollegeMIS").FindEntity<CdMajorEntity>(a => a.MajorNo == stuEnroll.MajorNo);
-                var deptNo = majorInfo?.DeptNo;
                 var majorName = majorInfo?.MajorName;
-                var deptName = this.BaseRepository("CollegeMIS").FindEntity<CdDeptEntity>(a => a.DeptNo == deptNo)?.DeptName;
                 var classInfo = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(a => a.ClassNo == stuEnroll.ClassNo);
                 var teacherInfo = new EmpInfoEntity();
                 var yearAndSemester = Common.GetSemesterAndYear();
@@ -615,7 +606,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                 return new
                 {
-                    deptName,
                     majorName,
                     className = classInfo?.ClassName,
                     teacherName = teacherInfo?.EmpName,
@@ -645,12 +635,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             public string standerdName { get; set; }
         }
 
-        internal object GetCheckInStatistics(string DeptNo, string MajorNo, string ClassNo)
+        internal object GetCheckInStatistics(string MajorNo, string ClassNo)
         {
             try
             {
                 var data = this.BaseRepository("CollegeMIS").FindList<StuEnrollEntity>()
-                    .Where(a => string.IsNullOrEmpty(DeptNo) || a.DeptNo == DeptNo)
                     .Where(a => string.IsNullOrEmpty(MajorNo) || a.MajorNo == MajorNo)
                     .Where(a => string.IsNullOrEmpty(ClassNo) || a.ClassNo == ClassNo)
 
@@ -672,12 +661,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        internal object GetHelpStatistics(string DeptNo, string MajorNo, string ClassNo)
+        internal object GetHelpStatistics(string MajorNo, string ClassNo)
         {
             try
             {
                 var data = this.BaseRepository("CollegeMIS").FindList<StuEnrollEntity>()
-                    .Where(a => string.IsNullOrEmpty(DeptNo) || a.DeptNo == DeptNo)
                     .Where(a => string.IsNullOrEmpty(MajorNo) || a.MajorNo == MajorNo)
                     .Where(a => string.IsNullOrEmpty(ClassNo) || a.ClassNo == ClassNo)
 
@@ -699,12 +687,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        internal object GetMilitaryStatistics(string DeptNo, string MajorNo, string ClassNo)
+        internal object GetMilitaryStatistics(string MajorNo, string ClassNo)
         {
             try
             {
                 var data = this.BaseRepository("CollegeMIS").FindList<StuEnrollEntity>()
-                   .Where(a => string.IsNullOrEmpty(DeptNo) || a.DeptNo == DeptNo)
                    .Where(a => string.IsNullOrEmpty(MajorNo) || a.MajorNo == MajorNo)
                    .Where(a => string.IsNullOrEmpty(ClassNo) || a.ClassNo == ClassNo)
 
@@ -814,11 +801,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("IDCard", "%" + queryParam["IDCard"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.IDCard Like @IDCard ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["Admissions"].IsEmpty())
                 {
                     dp.Add("Admissions", queryParam["Admissions"].ToString(), DbType.String);
@@ -1880,7 +1862,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         StuNo = newStudent.StuNo,
                         Birthday = newStudent.Birthday,
                         ClassNo = newStudent.ClassNo,
-                        DeptNo = newStudent.DeptNo,
                         MajorNo = newStudent.MajorNo,
                         MajorDetailName = newStudent.MajorName,
                         IdentityCardNo = newStudent.IDCard,
@@ -2049,34 +2030,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
 
-
-
-        public void SyncDept()
-        {
-            try
-            {
-                var data = this.BaseRepository("CollegeMIS").FindList<StuEnrollEntity>().ToList();
-                var majorList = this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>().ToList();
-                foreach (var item in data)
-                {
-                    var deptNo = majorList.FirstOrDefault(a => a.MajorNo == item.MajorNo)?.DeptNo;
-                    item.DeptNo = deptNo;
-                    this.BaseRepository("CollegeMIS").Update(item);
-
-                }
-            }
-            catch (Exception ex)
-            {
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowServiceException(ex);
-                }
-            }
-        }
         public void SyncMajor()
         {
             try