From 92b96a67ce216837ae900f616f7c0fe78f3b0ce2 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Tue, 29 Dec 2020 14:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=BC=82=E5=8A=A8=E3=80=81=E5=AD=A6=E7=B1=8D=E5=BC=82?=
 =?UTF-8?q?=E5=8A=A8=E5=8A=9F=E8=83=BD=E5=8F=96=E6=B6=88=E7=B3=BB=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArrangeLessonTermAttemper/Form.cshtml     |  8 ----
 .../Views/ArrangeLessonTermAttemper/Form.js   |  9 +----
 .../ArrangeLessonTermAttemper/FormView.cshtml |  8 ----
 .../ArrangeLessonTermAttemper/FormView.js     |  9 +----
 .../ArrangeLessonTermAttemper/Index.cshtml    |  4 --
 .../Views/ArrangeLessonTermAttemper/Index.js  | 29 +-------------
 .../Views/StuInfoBasicChange/Form.cshtml      |  8 ----
 .../Views/StuInfoBasicChange/Form.js          | 23 -----------
 .../Views/StuInfoBasicChange/FormView.cshtml  |  8 ----
 .../Views/StuInfoBasicChange/FormView.js      | 23 -----------
 .../Views/StuInfoBasicChange/Index.js         | 26 ------------
 .../ArrangeLessonTermAttemperEntity.cs        | 10 -----
 .../ArrangeLessonTermAttemperService.cs       | 40 ++++++++-----------
 .../StuInfoBasicChangeEntity.cs               | 10 -----
 .../StuInfoBasicChangeService.cs              |  4 +-
 15 files changed, 23 insertions(+), 196 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml
index 0b74ad44d..571320f73 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml	
@@ -59,10 +59,6 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="Semester" readonly isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" readonly isvalid="yes" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" readonly isvalid="yes" checkexpession="NotNull"></div>
@@ -100,10 +96,6 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="NewSemester" class="contentDiv" readonly></div>
     </div>
-    <div class="col-xs-4 lr-form-item AttemperType AttemperTypeDuiDiao" data-table="ArrangeLessonTermAttemper">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="NewDeptNo" class="contentDiv" readonly></div>
-    </div>
     <div class="col-xs-4 lr-form-item AttemperType AttemperTypeDuiDiao" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="NewMajorNo" class="contentDiv" readonly></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js
index 3bbd0b3b6..48f3bd3c6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js	
@@ -35,14 +35,13 @@ var bootstrap = function ($, learun) {
             //p.F_SchoolId = $('#F_SchoolId').lrselectGet();
             p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
             p.Semester = $('#Semester').lrselectGet();
-            p.DeptNo = $('#DeptNo').lrselectGet();
             p.MajorNo = $('#MajorNo').lrselectGet();
             p.LessonNo = $('#LessonNo').lrselectGet();
             p.TeachClassNo = $('#TeachClassNo').lrselectGet();
             p.EmpNo = $('#EmpNo').lrselectGet();
             p.ClassroomNo = $('#ClassroomNo').lrselectGet();
-            //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
-            if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
+            //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
+            if (!!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
                 //调度开始时间
                 $('#AttemperStartTime').lrselectRefresh({
                     allowSearch: true,
@@ -157,8 +156,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#NewDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#NewMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#LessonNo').lrselect({
@@ -245,7 +242,6 @@ var bootstrap = function ($, learun) {
             //$('#F_SchoolId').lrselectSet(temprow.schooldId);
             $('#AcademicYearNo').lrselectSet(temprow.academicyear);
             $('#Semester').lrselectSet(temprow.semester);
-            $('#DeptNo').lrselectSet(temprow.deptNo);
             $('#MajorNo').lrselectSet(temprow.majorNo);
             $('#LessonNo').lrselectSet(temprow.lessonNo);
             $('#TeachClassNo').lrselectSet(temprow.teachClassNo);
@@ -259,7 +255,6 @@ var bootstrap = function ($, learun) {
             //$('#NewF_SchoolId').lrselectSet(temprow.schooldId);
             $('#NewAcademicYearNo').lrselectSet(temprow.academicyear);
             $('#NewSemester').lrselectSet(temprow.semester);
-            $('#NewDeptNo').lrselectSet(temprow.deptNo);
             $('#NewMajorNo').lrselectSet(temprow.majorNo);
             $('#NewLessonNo').lrselectSet(temprow.lessonNo);
             $('#NewTeachClassNo').lrselectSet(temprow.teachClassNo);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml
index d7c970c4e..e1014df92 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml	
@@ -59,10 +59,6 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="Semester" readonly isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" readonly isvalid="yes" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" readonly isvalid="yes" checkexpession="NotNull"></div>
@@ -100,10 +96,6 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="NewSemester" class="contentDiv" readonly></div>
     </div>
-    <div class="col-xs-4 lr-form-item AttemperType AttemperTypeDuiDiao" data-table="ArrangeLessonTermAttemper">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="NewDeptNo" class="contentDiv" readonly></div>
-    </div>
     <div class="col-xs-4 lr-form-item AttemperType AttemperTypeDuiDiao" data-table="ArrangeLessonTermAttemper">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="NewMajorNo" class="contentDiv" readonly></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js
index fb37b83ac..067bfb059 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js	
@@ -35,14 +35,13 @@ var bootstrap = function ($, learun) {
             //p.F_SchoolId = $('#F_SchoolId').lrselectGet();
             p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
             p.Semester = $('#Semester').lrselectGet();
-            p.DeptNo = $('#DeptNo').lrselectGet();
             p.MajorNo = $('#MajorNo').lrselectGet();
             p.LessonNo = $('#LessonNo').lrselectGet();
             p.TeachClassNo = $('#TeachClassNo').lrselectGet();
             p.EmpNo = $('#EmpNo').lrselectGet();
             p.ClassroomNo = $('#ClassroomNo').lrselectGet();
-            //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
-            if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
+            //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
+            if (!!p.AcademicYearNo && !!p.Semester && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) {
                 //调度开始时间
                 $('#AttemperStartTime').lrselectRefresh({
                     allowSearch: true,
@@ -157,8 +156,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#NewDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#NewMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#LessonNo').lrselect({
@@ -247,7 +244,6 @@ var bootstrap = function ($, learun) {
             //$('#F_SchoolId').lrselectSet(temprow.schooldId);
             $('#AcademicYearNo').lrselectSet(temprow.academicyear);
             $('#Semester').lrselectSet(temprow.semester);
-            $('#DeptNo').lrselectSet(temprow.deptNo);
             $('#MajorNo').lrselectSet(temprow.majorNo);
             $('#LessonNo').lrselectSet(temprow.lessonNo);
             $('#TeachClassNo').lrselectSet(temprow.teachClassNo);
@@ -261,7 +257,6 @@ var bootstrap = function ($, learun) {
             //$('#NewF_SchoolId').lrselectSet(temprow.schooldId);
             $('#NewAcademicYearNo').lrselectSet(temprow.academicyear);
             $('#NewSemester').lrselectSet(temprow.semester);
-            $('#NewDeptNo').lrselectSet(temprow.deptNo);
             $('#NewMajorNo').lrselectSet(temprow.majorNo);
             $('#NewLessonNo').lrselectSet(temprow.lessonNo);
             $('#NewTeachClassNo').lrselectSet(temprow.teachClassNo);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.cshtml
index a5960c738..77403f136 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.cshtml	
@@ -30,10 +30,6 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="Semester"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
                                 <div class="col-xs-6 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/ArrangeLessonTermAttemper/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js
index b390431e8..f5d9464aa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js	
@@ -33,7 +33,6 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
             $('#TeachClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
@@ -199,19 +198,6 @@ var bootstrap = function ($, learun) {
                     //},
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
                     { label: "学期", name: "Semester", 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) {
@@ -277,20 +263,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-
-                    {
-                        label: "新系部", name: "NewDeptNo", 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: "NewMajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml
index 14626a53b..6d8344e38 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml	
@@ -27,10 +27,6 @@
     </div>
 
     <div class="col-xs-12 text-center">学籍原安排</div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo"  readonly="readonly"></div>
-    </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo"  readonly="readonly"></div>
@@ -42,10 +38,6 @@
 
     <div class="col-xs-12 text-center">学籍新安排</div>
     <div class="NewContainer" style="display:none;">
-        <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-            <div class="lr-form-item-title" data-title="新系部">新系部</div>
-            <div id="NewDeptNo" class="contentDiv "></div>
-        </div>
         <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="新专业">新专业</div>
             <div id="NewMajorNo" class="contentDiv "></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js
index 7ab5cc570..01adc7199 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js	
@@ -28,13 +28,11 @@ var bootstrap = function ($, learun) {
                         $(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
                         $(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
                         $(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
-                        $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $(".NewContainer").show();
                         if (item.id === "01" || item.id === "02") { //降级、转班
                             $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
-                            $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
                             $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
                         }
                         else if (item.id === "03") {    //转专业
@@ -44,7 +42,6 @@ var bootstrap = function ($, learun) {
                             $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                             $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                             $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                             $(".NewContainer").hide();
@@ -54,24 +51,8 @@ var bootstrap = function ($, learun) {
                 }
             });
             $('#StuChangeReason').lrDataItemSelect({ code: 'StuChangeReason' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#NewDeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
-                    if (item != null && item != undefined) {
-                        $('#NewMajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1 order by majorno" }
-                        });
-                    } else {
-                        $('#NewMajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "CheckMark=1 order by majorno" }
-                        });
-                    }
-                }
-            });
             $('#NewMajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) {
                     if (item != null && item != undefined) {
@@ -96,7 +77,6 @@ var bootstrap = function ($, learun) {
                         if (data) {
                             $("#StuNo").val(data.StuNo);
                             $("#StuName").val(data.StuName);
-                            $("#DeptNo").lrselectSet(data.DeptNo);
                             $("#MajorNo").lrselectSet(data.MajorNo);
                             $("#ClassNo").lrselectSet(data.ClassNo);
                         } else {
@@ -114,7 +94,6 @@ var bootstrap = function ($, learun) {
                         if (data) {
                             $("#StuNo").val(data.StuNo);
                             $("#StuName").val(data.StuName);
-                            $("#DeptNo").lrselectSet(data.DeptNo);
                             $("#MajorNo").lrselectSet(data.MajorNo);
                             $("#ClassNo").lrselectSet(data.ClassNo);
                         } else {
@@ -143,7 +122,6 @@ var bootstrap = function ($, learun) {
                             $(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
                             $(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
                             $(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
-                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $(".NewContainer").show();
@@ -157,7 +135,6 @@ var bootstrap = function ($, learun) {
                                 $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                                 $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
                                 $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                                 $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                                 $(".NewContainer").hide();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.cshtml
index 49adb43d5..717f25d7d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.cshtml	
@@ -27,10 +27,6 @@
     </div>
 
     <div class="col-xs-12 text-center">学籍原安排</div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-        <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
-    </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
@@ -42,10 +38,6 @@
 
     <div class="col-xs-12 text-center">学籍新安排</div>
     <div class="NewContainer" style="display:none;">
-        <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
-            <div class="lr-form-item-title" data-title="新系部">新系部</div>
-            <div id="NewDeptNo" class="contentDiv "></div>
-        </div>
         <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="新专业">新专业</div>
             <div id="NewMajorNo" class="contentDiv "></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js
index 4b152fe0f..47116b74e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js	
@@ -27,13 +27,11 @@ var bootstrap = function ($, learun) {
                         $(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
                         $(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
                         $(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
-                        $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $(".NewContainer").show();
                         if (item.id === "01" || item.id === "02") { //降级、转班
                             //$(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
-                            $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
                             $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
                         }
                         else if (item.id === "03") {    //转专业
@@ -43,7 +41,6 @@ var bootstrap = function ($, learun) {
                             $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                             $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                             //$(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                             $(".NewContainer").hide();
@@ -53,24 +50,8 @@ var bootstrap = function ($, learun) {
                 }
             });
             $('#StuChangeReason').lrDataItemSelect({ code: 'StuChangeReason' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
-            $('#NewDeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
-                    if (item != null && item != undefined) {
-                        $('#NewMajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1 order by majorno" }
-                        });
-                    } else {
-                        $('#NewMajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-                            param: { strWhere: "CheckMark=1 order by majorno" }
-                        });
-                    }
-                }
-            });
             $('#NewMajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) {
                     if (item != null && item != undefined) {
@@ -95,7 +76,6 @@ var bootstrap = function ($, learun) {
             //            if (data) {
             //                $("#StuNo").val(data.StuNo);
             //                $("#StuName").val(data.StuName);
-            //                $("#DeptNo").lrselectSet(data.DeptNo);
             //                $("#MajorNo").lrselectSet(data.MajorNo);
             //                $("#ClassNo").lrselectSet(data.ClassNo);
             //            } else {
@@ -113,7 +93,6 @@ var bootstrap = function ($, learun) {
             //            if (data) {
             //                $("#StuNo").val(data.StuNo);
             //                $("#StuName").val(data.StuName);
-            //                $("#DeptNo").lrselectSet(data.DeptNo);
             //                $("#MajorNo").lrselectSet(data.MajorNo);
             //                $("#ClassNo").lrselectSet(data.ClassNo);
             //            } else {
@@ -142,7 +121,6 @@ var bootstrap = function ($, learun) {
                             $(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
                             $(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
                             $(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
-                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $(".NewContainer").show();
@@ -156,7 +134,6 @@ var bootstrap = function ($, learun) {
                                 $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                                 $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                                 //$(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
                                 $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                                 $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                                 $(".NewContainer").hide();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js
index 1334b21eb..4a8a53b06 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js	
@@ -140,19 +140,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        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) {
@@ -179,19 +166,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: "新系部", name: "NewDeptNo", 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: "NewMajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs
index 4593f93d5..8f84b75f0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs	
@@ -40,11 +40,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// DeptNo
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// MajorNo
         /// </summary>
         [Column("MAJORNO")]
@@ -75,11 +70,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("ATTEMPERTIMETYPE")]
         public string AttemperTimeType { get; set; }
         /// <summary>
-        /// NewDeptNo
-        /// </summary>
-        [Column("NEWDEPTNO")]
-        public string NewDeptNo { get; set; }
-        /// <summary>
         /// NewMajorNo
         /// </summary>
         [Column("NEWMAJORNO")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs
index 30069a1da..88edce60e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs	
@@ -61,11 +61,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
                     strSql.Append(" AND t.Semester = @Semester ");
                 }
-                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);
@@ -270,8 +265,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         if (entity.AttemperType == "01")    //调课
                         {
                             //ArrangeLessonTerm
-                            //var ArrangeLessonTermList = db.FindList<ArrangeLessonTermEntity>(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.DeptNo && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo && x.LessonDate >= entity.AttemperStartTime && x.LessonDate <= entity.AttemperEndTime);
-                            var ArrangeLessonTermList = db.FindList<ArrangeLessonTermEntity>(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.DeptNo && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo && x.LessonDate >= entity.AttemperStartTime && x.LessonDate <= entity.AttemperEndTime);
+                            //var ArrangeLessonTermList = db.FindList<ArrangeLessonTermEntity>(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo && x.LessonDate >= entity.AttemperStartTime && x.LessonDate <= entity.AttemperEndTime);
+                            var ArrangeLessonTermList = db.FindList<ArrangeLessonTermEntity>(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo && x.LessonDate >= entity.AttemperStartTime && x.LessonDate <= entity.AttemperEndTime);
                             if (ArrangeLessonTermList.Any())
                             {
                                 foreach (var item in ArrangeLessonTermList)
@@ -293,14 +288,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 if (!string.IsNullOrEmpty(entity.NewEmpNo))
                                 {
                                     //TeachClass
-                                    //db.ExecuteBySql($"update TeachClass set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
-                                    db.ExecuteBySql($"update TeachClass set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+                                    //db.ExecuteBySql($"update TeachClass set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+                                    db.ExecuteBySql($"update TeachClass set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
                                     //StuSelectLessonList
-                                    //db.ExecuteBySql($"update StuSelectLessonList set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
-                                    db.ExecuteBySql($"update StuSelectLessonList set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+                                    //db.ExecuteBySql($"update StuSelectLessonList set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+                                    db.ExecuteBySql($"update StuSelectLessonList set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
                                     //StuScore
-                                    //db.ExecuteBySql($"update StuScore set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
-                                    db.ExecuteBySql($"update StuScore set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
+                                    //db.ExecuteBySql($"update StuScore set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
+                                    db.ExecuteBySql($"update StuScore set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
                                     //EmpReportCard
                                     //todo：分校区版初始化成绩时，初始化学生成绩未赋值F_SchoolId，初始化教师成绩单未赋值F_SchoolId
                                     //db.ExecuteBySql($"update EmpReportCard set EmpNo='{entity.NewEmpNo}',EmpName='{db.FindEntity<EmpInfoEntity>(x => x.EmpNo == entity.NewEmpNo)?.EmpName}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and LessonNo='{entity.LessonNo}' and ClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
@@ -311,19 +306,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         else if (entity.AttemperType == "02")    //停课
                         {
                             //ArrangeLessonTerm
-                            //db.ExecuteBySql($"update ArrangeLessonTerm set CheckMark='0' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo like '%{entity.TeachClassNo}%' and EmpNo='{entity.EmpNo}' and ClassroomNo='{entity.ClassroomNo}' ");
-                            db.ExecuteBySql($"update ArrangeLessonTerm set CheckMark='0' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo like '%{entity.TeachClassNo}%' and EmpNo='{entity.EmpNo}' and ClassroomNo='{entity.ClassroomNo}' ");
+                            //db.ExecuteBySql($"update ArrangeLessonTerm set CheckMark='0' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo like '%{entity.TeachClassNo}%' and EmpNo='{entity.EmpNo}' and ClassroomNo='{entity.ClassroomNo}' ");
+                            db.ExecuteBySql($"update ArrangeLessonTerm set CheckMark='0' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo like '%{entity.TeachClassNo}%' and EmpNo='{entity.EmpNo}' and ClassroomNo='{entity.ClassroomNo}' ");
                             //StuSelectLessonList
-                            //db.ExecuteBySql($"update StuSelectLessonList set CheckMark='0' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
-                            db.ExecuteBySql($"update StuSelectLessonList set CheckMark='0' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+                            //db.ExecuteBySql($"update StuSelectLessonList set CheckMark='0' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+                            db.ExecuteBySql($"update StuSelectLessonList set CheckMark='0' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
                         }
                         else if (entity.AttemperType == "03")    //对调
                         {
                             //ArrangeLessonTerm
-                            //var ArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.DeptNo && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo);
-                            var ArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.DeptNo && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo);
-                            //var NewArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.NewDeptNo && x.MajorNo == entity.NewMajorNo && x.LessonNo == entity.NewLessonNo && x.TeachClassNo.Contains(entity.NewTeachClassNo) && x.EmpNo == entity.NewEmpNo && x.ClassroomNo == entity.NewClassroomNo);
-                            var NewArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.NewDeptNo && x.MajorNo == entity.NewMajorNo && x.LessonNo == entity.NewLessonNo && x.TeachClassNo.Contains(entity.NewTeachClassNo) && x.EmpNo == entity.NewEmpNo && x.ClassroomNo == entity.NewClassroomNo);
+                            //var ArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo);
+                            var ArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo);
+                            //var NewArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.NewMajorNo && x.LessonNo == entity.NewLessonNo && x.TeachClassNo.Contains(entity.NewTeachClassNo) && x.EmpNo == entity.NewEmpNo && x.ClassroomNo == entity.NewClassroomNo);
+                            var NewArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.NewMajorNo && x.LessonNo == entity.NewLessonNo && x.TeachClassNo.Contains(entity.NewTeachClassNo) && x.EmpNo == entity.NewEmpNo && x.ClassroomNo == entity.NewClassroomNo);
                             if (ArrangeLessonTermList.Any() && NewArrangeLessonTermList.Any())
                             {
                                 var oldEntity = ArrangeLessonTermList.FirstOrDefault();
@@ -331,7 +326,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                                 var oldEntityTemp = new ArrangeLessonTermEntity()
                                 {
-                                    DeptNo = oldEntity.DeptNo,
                                     MajorNo = oldEntity.MajorNo,
                                     LessonNo = oldEntity.LessonNo,
                                     LessonName = oldEntity.LessonName,
@@ -351,7 +345,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                                 foreach (var item in ArrangeLessonTermList)
                                 {
-                                    item.DeptNo = newEntity.DeptNo;
                                     item.MajorNo = newEntity.MajorNo;
                                     item.LessonNo = newEntity.LessonNo;
                                     item.LessonName = newEntity.LessonName;
@@ -371,7 +364,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 }
                                 foreach (var newitem in NewArrangeLessonTermList)
                                 {
-                                    newitem.DeptNo = oldEntityTemp.DeptNo;
                                     newitem.MajorNo = oldEntityTemp.MajorNo;
                                     newitem.LessonNo = oldEntityTemp.LessonNo;
                                     newitem.LessonName = oldEntityTemp.LessonName;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs
index 4e04ce9f7..f2fe9194c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs	
@@ -30,11 +30,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUNAME")]
         public string StuName { get; set; }
         /// <summary>
-        /// DeptNo
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// MajorNo
         /// </summary>
         [Column("MAJORNO")]
@@ -60,11 +55,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUCHANGEREMARK")]
         public string StuChangeRemark { get; set; }
         /// <summary>
-        /// NewDeptNo
-        /// </summary>
-        [Column("NEWDEPTNO")]
-        public string NewDeptNo { get; set; }
-        /// <summary>
         /// NewMajorNo
         /// </summary>
         [Column("NEWMAJORNO")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs
index 5fb126220..380d70153 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs	
@@ -159,7 +159,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
                         if (classInfoEntity != null)
                         {
-                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+                            db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
                         }
                     }
                     else if (entity.StuChangeType == "04" || entity.StuChangeType == "05")  //退学、休学
@@ -210,7 +210,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.ClassNo);
                         if (classInfoEntity != null)
                         {
-                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+                            db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
                         }
                     }
                     else if (entity.StuChangeType == "04" || entity.StuChangeType == "05")  //退学、休学