【修改】选修排课、选课、选修成绩录入、问卷调查等功能取消系；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/AnswerIndex.js

@@ -48,18 +48,6 @@ var bootstrap = function ($, learun) {
                             return cellvalue === true ? "男" : "女";
                         }
                     },
-                    {
-                        label: "考核系部", name: "DeptNo", width: 150, 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: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/Form.cshtml

@@ -41,11 +41,6 @@
         <div class="lr-form-item-title">考核学期<font face="宋体">*</font></div>
         <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ask_Main">
-        <div class="lr-form-item-title">考核系部</div>
-        <div id="DeptNos"></div>
-        <input id="DeptNosName" type="hidden" />
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ask_Main">
         <div class="lr-form-item-title">考核专业</div>
         <div id="MajorNos"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/Form.js

@@ -34,7 +34,6 @@ var bootstrap = function ($, learun) {
                 $('#ATId').lrselectSet(pATId);
             }
             $("#Semester").lrDataItemSelect({ code: 'Semester' });
-            $('#DeptNos').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname', type: 'multiple' });
             $('#MajorNos').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname', type: 'multiple' });
             $('#LessonNos').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', type: 'multiple' });
             $('#ClassNos').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname', type: 'multiple' });
@@ -71,7 +70,6 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
-        $("#DeptNosName").val($("#DeptNos").find(".lr-select-placeholder").text());
         $("#MajorNosName").val($("#MajorNos").find(".lr-select-placeholder").text());
         $("#ClassNosName").val($("#ClassNos").find(".lr-select-placeholder").text());
         $("#GradeNosName").val($("#GradeNos").find(".lr-select-placeholder").text());

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/Index.js

@@ -203,9 +203,6 @@ var bootstrap = function ($, learun) {
                     { label: "结束时间", name: "VStopTime", width: 100, align: "left" },
                     { label: "考核学年", name: "AcademicYearNo", width: 80, align: "left" },
                     { label: "考核学期", name: "Semester", width: 80, align: "left" },
-                    {
-                        label: "考核系部", name: "DeptNosName", width: 150, align: "left"
-                    },
                     {
                         label: "考核专业", name: "MajorNosName", width: 150, align: "left"
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/IndexOfElective.cshtml

@@ -22,10 +22,6 @@
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></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="Grade"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/IndexOfElective.js

@@ -19,7 +19,6 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
                 value: 'value',
@@ -64,19 +63,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: "GraduateNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.cshtml

@@ -22,10 +22,6 @@
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></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="Grade"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js

@@ -18,7 +18,6 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
                 value: 'value',
@@ -89,19 +88,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: "GraduateNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js

@@ -47,19 +47,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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js

@@ -47,19 +47,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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/AuditIndex.js

@@ -80,19 +80,6 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { 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.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/FinishIndex.js

@@ -43,19 +43,6 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "学号", name: "StuNo", width: 100, align: "left"},
                     { 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.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml

@@ -22,15 +22,11 @@
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></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>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js

@@ -43,7 +43,6 @@ var bootstrap = function ($, learun) {
             $('#ElectiveSelectStatus').lrDataItemSelect({ code: 'ElectiveSelectStatus' });
             $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#LessonNo').lrselect({
@@ -78,19 +77,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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectivePre/AuditIndex.js

@@ -80,19 +80,6 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { 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.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectivePre/FinishIndex.js

@@ -43,19 +43,6 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "学号", name: "StuNo", width: 100, align: "left"},
                     { 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.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectivePre/QueryStuSelectResult.cshtml

@@ -22,15 +22,11 @@
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></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>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectivePre/QueryStuSelectResult.js

@@ -43,7 +43,6 @@ var bootstrap = function ($, learun) {
             $('#ElectiveSelectStatus').lrDataItemSelect({ code: 'ElectiveSelectStatus' });
             $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             // 刷新
@@ -71,19 +70,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) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Ask/Ask_Main/Ask_MainEntity.cs

@@ -76,17 +76,6 @@ namespace Learun.Application.TwoDevelopment.Ask
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// DeptNos
-        /// </summary>
-        [Column("DEPTNOS")]
-        public string DeptNos { get; set; }
-
-        /// <summary>
-        /// DeptNosName
-        /// </summary>
-        [Column("DEPTNOSNAME")]
-        public string DeptNosName { get; set; }
-        /// <summary>
         /// MajorNos
         /// </summary>
         [Column("MAJORNOS")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Ask/Ask_Main/Ask_MainService.cs

@@ -43,7 +43,6 @@ namespace Learun.Application.TwoDevelopment.Ask
                 t.VStopTime,
                 t.AcademicYearNo,
                 t.Semester,
-                t.DeptNos,t.DeptNosName,
                 t.MajorNos,t.MajorNosName,
                 t.LessonNos,t.LessonNosName,
                 t.ClassNos,t.ClassNosName,
@@ -104,12 +103,11 @@ namespace Learun.Application.TwoDevelopment.Ask
                 t.VStopTime,
                 t.AcademicYearNo,
                 t.Semester,
-                t.DeptNos,t.DeptNosName,
                 t.MajorNos,t.MajorNosName,
                 t.LessonNos,t.LessonNosName,
                 t.ClassNos,t.ClassNosName,
                 t.GradeNos,t.GradeNosName,
-                t.VHide,t.SPVNum,t.SPNum,t.SClick,t.Status,b.IsAnswer,b.TotalScore,b.CreateDate,c.StuNo,c.StuName,c.genderno,c.deptno,c.majorno,c.classno,c.grade  
+                t.VHide,t.SPVNum,t.SPNum,t.SClick,t.Status,b.IsAnswer,b.TotalScore,b.CreateDate,c.StuNo,c.StuName,c.genderno,c.majorno,c.classno,c.grade  
                 ");
                 strSql.Append("  FROM " + basedbname + ".dbo.Ask_Main t right join " + basedbname + ".dbo.Ask_StudentMain b on t.VID=b.VID left join " + misdbname + ".dbo.stuinfobasic c on b.StuNo=c.StuNo ");
                 strSql.Append("  WHERE 1=1 ");
@@ -300,15 +298,6 @@ namespace Learun.Application.TwoDevelopment.Ask
                     entity.VCreateTime = DateTime.Now;
                     //统计调查人数
                     StringBuilder sql = new StringBuilder("select  distinct * from StuInfoBasic a where CheckMark=1 ");
-                    if (!string.IsNullOrEmpty(entity.DeptNos))
-                    {
-                        List<string> deptList = entity.DeptNos.Split(',').ToList();
-                        for (var i = 0; i < deptList.Count; i++)
-                        {
-                            deptList[i] = "'" + deptList[i] + "'";
-                        }
-                        sql.Append(" and a.DeptNo in(" + string.Join(",", deptList.ToArray()) + ")");
-                    }
                     if (!string.IsNullOrEmpty(entity.MajorNos))
                     {
                         List<string> deptList = entity.MajorNos.Split(',').ToList();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs

@@ -29,7 +29,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.MajorName,t.MajorNo,t.LengthOfSchooling,t.SubjectSpeciesNo,t.F_SchoolId,t.DeptNo,t.GraduateNo,a.OLPOEId,a.Id as ElectiveMajorId,a.Grade FROM ElectiveMajor a left join CdMajor t on a.majorid=t.id");
+                strSql.Append("SELECT t.MajorName,t.MajorNo,t.LengthOfSchooling,t.SubjectSpeciesNo,t.F_SchoolId,t.GraduateNo,a.OLPOEId,a.Id as ElectiveMajorId,a.Grade FROM ElectiveMajor a left join CdMajor t on a.majorid=t.id");
                 strSql.Append("  WHERE 1=1 and t.checkmark=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -49,11 +49,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("MajorName", "%" + queryParam["MajorName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.MajorName Like @MajorName ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["F_SchoolId"].IsEmpty())
                 {
                     dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SignUpAboutOnline/SignUpAboutOnlineService.cs

@@ -212,7 +212,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         IdentityCardNo = model.IdCard,
                         telephone = model.Phone,
                         MajorNo = model.MajorNo,
-                        DeptNo = db.FindEntity<CdMajorEntity>(model.MajorNo)?.DeptNo,
                         IsAccommodate = model.IsAccommodate,
                         HeightWeight = model.HeightWeight,
                         CreateUserId = LoginUserInfo.Get().userId

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs

@@ -402,7 +402,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var queryParam = queryJson.ToJObject();
                 var strSql = new StringBuilder();
-                strSql.Append("select a.StuNo,a.StuName,a.GenderNo,a.DeptNo,a.MajorNo,a.F_SchoolId,a.ClassNo,b.remark,b.Status,b.Id,");
+                strSql.Append("select a.StuNo,a.StuName,a.GenderNo,a.MajorNo,a.F_SchoolId,a.ClassNo,b.remark,b.Status,b.Id,");
                 strSql.Append("'" + queryParam["AcademicYearNo"].ToString() + "' as AcademicYearNo,'" + queryParam["Semester"].ToString() + "' as Semester,");
                 //strSql.Append("b.AcademicYearNo,b.Semester,");
                 strSql.Append("c.LessonSection,c.LessonTime,c.StudyScore,c.LessonNo,c.LessonName,c.EmpNo,c.EmpName,c.ClassRoomNo,c.ClassRoomName");
@@ -432,11 +432,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 //    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
                 //    strSql.Append(" AND b.Semester = @Semester ");
                 //}
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND a.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElectivePre/StuSelectLessonListOfElectivePreService.cs

@@ -365,7 +365,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var queryParam = queryJson.ToJObject();
                 var strSql = new StringBuilder();
-                strSql.Append("select a.StuNo,a.StuName,a.GenderNo,a.DeptNo,a.MajorNo,a.F_SchoolId,a.ClassNo,b.remark,b.Status,b.Id,");
+                strSql.Append("select a.StuNo,a.StuName,a.GenderNo,a.MajorNo,a.F_SchoolId,a.ClassNo,b.remark,b.Status,b.Id,");
                 strSql.Append("'" + queryParam["AcademicYearNo"].ToString() + "' as AcademicYearNo,'" + queryParam["Semester"].ToString() + "' as Semester,");
                 //strSql.Append(@"c.LessonSection,c.LessonTime,c.StudyScore,c.LessonNo,
                 //c.LessonName,c.EmpNo,c.EmpName,c.ClassRoomNo,c.ClassRoomName from stuinfobasic a 
@@ -400,11 +400,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 //    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
                 //    strSql.Append(" AND c.Semester = @Semester ");
                 //}
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND a.DeptNo = @DeptNo ");
-                }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
                     dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);