From ed7bb39f4c767fabf3a31ed293815136ee12a229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Mon, 24 Apr 2023 03:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=AF=BE=E6=B7=BB=E5=8A=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../teacherOpenCourseScheduleSession/add.js   | 30 +++++++++++--------
 .../teacherOpenCourseScheduleSession/add.html |  4 +--
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
index 5a6f93d4..f69b5193 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
@@ -389,6 +389,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
         if (ret.code == 0) {
             var data = ret.data[0];
             $("#teacherOpenCourseName").val(data.teacherOpenCourseTitle);
+
             $("#teacherId option[value='" + data.teacherId + "']").attr("selected", "selected");
             var xmSeValue = data.schoolClassIds;
             if(!$.isEmpty(xmSeValue)){
@@ -409,27 +410,32 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
                 var teacherOpenCourseScheduleSessionId = $("#addForm input[name='teacherOpenCourseScheduleSessionId']").val();
                 var scheduleSessionTitle = $("#addForm input[name='scheduleSessionTitle']").val();
                 /*var courseInfoId =$("#addForm select[name='courseInfoId_1']").val();*/
+                //课程来源：0：教师开课课程，1：授权课程
+                var courseType = $("#addForm select[name='teacherOpenCourseId']").find("option:selected").attr("status");
                 var teacherOpenCourseId = $("#addForm select[name='teacherOpenCourseId']").val();
+                if(!$.isEmpty(teacherOpenCourseId_default)){
+                    teacherOpenCourseId = teacherOpenCourseId_default;
+                    courseType = '0';
+                }
+
                 var teacherId = $("#addForm select[name='teacherId']").val();
                 var schoolClassIds = demo1.getValue('value').join(",");
                 var teacherOpenCourseScheduleSessionClassIsMultiple = $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val();
                 // 构建后台所需要的开课节次List数据
                 var sessionTagListMap = {};
-                //课程来源：0：教师开课课程，1：授权课程
-                var courseType = $("#addForm select[name='teacherOpenCourseId']").find("option:selected").attr("status");
 
                 currentTableCache().forEach(item => {
                     var sessionClassId = item.teacherOpenCourseScheduleSessionClassId;
-                var data = table.checkStatus('kkJieciTable').data;
-                if ((item.LAY_CHECKED != true && data.length > 0) || !sessionClassId) {
-                    return;
-                }
-                if (sessionTagListMap.hasOwnProperty(sessionClassId)) {
-                    sessionTagListMap[sessionClassId].push(item)
-                } else {
-                    (sessionTagListMap[sessionClassId] = []).push(item)
-                }
-            })
+                    var data = table.checkStatus('kkJieciTable').data;
+                    if ((item.LAY_CHECKED != true && data.length > 0) || !sessionClassId) {
+                        return;
+                    }
+                    if (sessionTagListMap.hasOwnProperty(sessionClassId)) {
+                        sessionTagListMap[sessionClassId].push(item)
+                    } else {
+                        (sessionTagListMap[sessionClassId] = []).push(item)
+                    }
+                })
 
 
                 var teacherOpenCourseScheduleSessionStartDate = $("#addForm input[name='teacherOpenCourseScheduleSessionStartDate']").val();
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index 9fc40778..fea1f84e 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -61,10 +61,10 @@
 
                     <!--#if(user.get().isAdmin){ -->
                     <!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
-                    <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "teacherOpenCourseId", "isShowGroupName": "true", "defaultValue":teacherOpenCourseScheduleSession.teacherOpenCourseId+"", isShowOpentCourse:"true"}) {} -->
+                    <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "teacherOpenCourseId", "isShowGroupName": "true", "defaultValue":teacherOpenCourseScheduleSession.teacherOpenCourseId, isShowOpentCourse:"true"}) {} -->
 
                     <!--#}else{ -->
-                    <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "teacherOpenCourseId", "isShowGroupName": "false","filterName": "理论课程类", "defaultValue":teacherOpenCourseScheduleSession.teacherOpenCourseId, isShowOpentCourse:"true"}) {} -->
+                    <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "teacherOpenCourseId", "isShowGroupName": "false","filterName": "理论课程类", "defaultValue":!isEmpty(teacherOpenCourseScheduleSession.teacherOpenCourseId!)?teacherOpenCourseScheduleSession.teacherOpenCourseId:teacherOpenCourseScheduleSession.courseInfoId, isShowOpentCourse:"true"}) {} -->
                     <!--#} -->
                 </div>
             </div>