diff --git a/web/src/main/resources/static/js/jlw/teachingManagement/add.js b/web/src/main/resources/static/js/jlw/teachingManagement/add.js
index 2a5236ee..ecd83431 100644
--- a/web/src/main/resources/static/js/jlw/teachingManagement/add.js
+++ b/web/src/main/resources/static/js/jlw/teachingManagement/add.js
@@ -10,10 +10,13 @@ layui.define(['form', 'laydate', 'table', 'teachingManagementApi', 'table', 'xmS
     var universityFacultyId = $("#addForm select[name='universityFacultyInfo']").val();
 
     var universitySystemId = $("#addForm select[name='universitySystemInfo']").val();
-    var classData = Common.getAjax('/jlw/schoolClass/getValues.json', {
-        universitySystemId: universitySystemId,
-        universityFacultyId: universityFacultyId
-    }).data;//上课班级多选框data
+    var classData = []
+    if (!$.isEmpty(universityFacultyId) && !$.isEmpty(universitySystemId)){
+        classData = Common.getAjax('/jlw/schoolClass/getValues.json', {
+            universitySystemId: universitySystemId,
+            universityFacultyId: universityFacultyId
+        }).data;//上课班级多选框data
+    }
     var xmSeValue = $("#demo1").data('value');
     var xmSeInitValue = [];
     if (!$.isEmpty(xmSeValue)) {
@@ -159,7 +162,8 @@ layui.define(['form', 'laydate', 'table', 'teachingManagementApi', 'table', 'xmS
                          time: 1500 //2秒关闭（如果不配置，默认是3秒）
                      },function (){
                          if(ret.code == 0){
-                             Lib.tableRefresh();
+                             parent.Lib.tableRefresh();
+                             Lib.closeFrame();
                          }
                      });
 
@@ -176,18 +180,39 @@ layui.define(['form', 'laydate', 'table', 'teachingManagementApi', 'table', 'xmS
     form.on('select(select_universityFaculty)', function (obj) {//院系
         Lib.getUniversitySystems($("select[name='universitySystemInfo']"),obj.value);
         universitySystemId = $("#addForm select[name='universitySystemInfo']").val();
-        classData = Common.getAjax('/jlw/schoolClass/getValues.json', {
+        var universitySystemList = Common.getAjax('/jlw/universitySystem/getValues.json', {
             universitySystemId: universitySystemId,
             universityFacultyId: obj.value
-        }).data;//上课班级多选框data
+        }).data;
+        var htm = '<option value="">请选择</option>';//universitySystemInfo
+        for (var i = 0;i < universitySystemList.length;i++){
+            htm += '<option value="'+universitySystemList[i].universitySystemId+'">'+universitySystemList[i].universitySystemName+'</option>';
+        }
+        $("#universitySystemInfo").empty();
+        $("#universitySystemInfo").append(htm);
+        form.render();
+        //重置班级
+        classData = [];//上课班级多选框data
         demo1.update({
             data: classData
         })
     });
-    //查询班级
+    //查询班级与教师
     form.on('select(select_universitySystem)', function (obj) {//专业
         Lib.getClassByUniSys($("select[name='schoolClassInfo']"),obj.value);
         universityFacultyId = $("#addForm select[name='universityFacultyInfo']").val();
+        //教师
+        var universitySystemList = Common.getAjax('/jlw/teacher/getValues.json', {
+            universitySystemId: obj.value,
+            universityFacultyId: universityFacultyId
+        }).data;
+        var htm = '<option value="">请选择</option>';//universitySystemInfo
+        for (var i = 0;i < universitySystemList.length;i++){
+            htm += '<option value="'+universitySystemList[i].teacherId+'">'+universitySystemList[i].teacherName+'</option>';
+        }
+        $("#teacherInfo").empty();
+        $("#teacherInfo").append(htm);
+        form.render();
         classData = Common.getAjax('/jlw/schoolClass/getValues.json', {
             universitySystemId: obj.value,
             universityFacultyId: universityFacultyId
diff --git a/web/src/main/resources/templates/jlw/teachingManagement/add.html b/web/src/main/resources/templates/jlw/teachingManagement/add.html
index be1e2090..56ba1a44 100644
--- a/web/src/main/resources/templates/jlw/teachingManagement/add.html
+++ b/web/src/main/resources/templates/jlw/teachingManagement/add.html
@@ -20,9 +20,10 @@
 				<label class="layui-form-label">所属院系：</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline'
-											value="${teachingManagement.universityFacultyInfo}"
-											type="university_faculty.university_faculty_name.university_faculty_status=1,find_in_set(org_id, ${user.get().orgId!''})"
-											id="universityFacultyId" name="universityFacultyInfo" layFilter="select_universityFaculty"/>
+						value="${teachingManagement.universityFacultyInfo}"
+						dis="${teachingManagement.teacherMergeClassThirdId==null?'':'disabled'}"
+						type="university_faculty.university_faculty_name.university_faculty_status=1,find_in_set(org_id, ${user.get().orgId!''})"
+						id="universityFacultyId" name="universityFacultyInfo" layFilter="select_universityFaculty"/>
 				</div>
 			</div>
 		</div>
@@ -33,9 +34,10 @@
 				<label class="layui-form-label"><span class="req">*</span>所属专业：</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline'
-											value="${teachingManagement.universitySystemInfo}"
-type="university_system.university_system_name.university_system_status=1,university_faculty_id=${teachingManagement.universityFacultyInfo}"
-											id="universitySystemId" name="universitySystemInfo" layFilter="select_universitySystem" />
+						dis="${teachingManagement.teacherMergeClassThirdId==null?'':'disabled'}"
+						value="${teachingManagement.universitySystemInfo}"
+						type="university_system.university_system_name.university_system_status=1,university_faculty_id=${teachingManagement.universityFacultyInfo}"
+						id="universitySystemId" name="universitySystemInfo" layFilter="select_universitySystem" />
 				</div>
 			</div>
 		</div>
@@ -46,10 +48,18 @@ type="university_system.university_system_name.university_system_status=1,univer
 			<div class="layui-inline">
 				<label class="layui-form-label">教师名称：</label>
 				<div class="layui-input-inline">
-					<layui:simpleDictSelect style='layui-input-inline'
-											value="${teachingManagement.teacherInfo}"
-											type="teacher.teacher_name.teacher_status=1"
-											id="teacherInfo" name="teacherInfo"/>
+					<!--#if(teachingManagement.teacherMergeClassThirdId != null){-->
+						<layui:simpleDictSelect style='layui-input-inline'
+							dis="${teachingManagement.teacherMergeClassThirdId==null?'':'disabled'}"
+							value="${teachingManagement.teacherInfo}"
+							type="teacher.teacher_name.teacher_status=1,university_system_id=${teachingManagement.universitySystemInfo}"
+							id="teacherInfo" name="teacherInfo"/>
+					<!--#}  -->
+					<!--#if(teachingManagement.teacherMergeClassThirdId == null){-->
+						<select name="teacherInfo" id="teacherInfo">
+							<option value="">请选择</option>
+						</select>
+					<!--#}  -->
 				</div>
 			</div>
 		</div>