From 8844a47e6331c2faf3ef4ded708b774f1b9a40e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Fri, 14 Apr 2023 00:50:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/jlw/schoolClass/add.html    |  2 +-
 .../main/resources/templates/jlw/teacher/add.html   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/src/main/resources/templates/jlw/schoolClass/add.html b/web/src/main/resources/templates/jlw/schoolClass/add.html
index 6484a168..99be5127 100644
--- a/web/src/main/resources/templates/jlw/schoolClass/add.html
+++ b/web/src/main/resources/templates/jlw/schoolClass/add.html
@@ -42,7 +42,7 @@
                     <layui:simpleDictSelect style='layui-input-inline'
                                             type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${schoolClass.universitiesCollegesId!''}"
                                             id="universityFacultyId" name="universityFacultyId"
-                                            value="${universityFacultyId!''}" layFilter="select_universityFacultyIds"
+                                            value="${schoolClass.universityFacultyId!''}" layFilter="select_universityFacultyIds"
                                             lay-verify="required"/>
                 </div>
             </div>
diff --git a/web/src/main/resources/templates/jlw/teacher/add.html b/web/src/main/resources/templates/jlw/teacher/add.html
index 76e8a57a..75fbe451 100644
--- a/web/src/main/resources/templates/jlw/teacher/add.html
+++ b/web/src/main/resources/templates/jlw/teacher/add.html
@@ -25,7 +25,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label"><span class="req">*</span>所属院系：</label>
                 <div class="layui-input-inline">
-                    <layui:simpleDictSelect style='layui-input-inline'
+                    <layui:simpleDictSelect style='layui-input-inline' value="${teacher.universityFacultyId}"
                                             type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesInfo.universitiesCollegesId!''},find_in_set(org_id, ${user.get().orgId!''})"
                                             id="universityFacultyId" name="universityFacultyId" lay-verify="required"
                                             layFilter="select_universityFacultyIds"/>
@@ -36,12 +36,13 @@
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
-                <label class="layui-form-label"><span class="req">*</span>专业：</label>
+                <label class="layui-form-label"><span class="req">*</span>所属专业：</label>
                 <div class="layui-input-inline">
-                    <select name="universitySystemId" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-            </div>
+                    <layui:simpleDictSelect style='layui-input-inline'
+                                            type="university_system.university_system_name.university_system_status=1,university_faculty_id=${teacher.universityFacultyId!''},find_in_set(org_id, ${user.get().orgId!''})"
+                                            id="universitySystemId" name="universitySystemId"
+                                            value="${teacher.universitySystemId!''}" lay-verify="required"/>
+                </div>
         </div>
     </div>
     </div>

From 0b70ca63acd2b0698083acba7a6adff5197598cf Mon Sep 17 00:00:00 2001
From: yangdj <18302547071@163>
Date: Fri, 14 Apr 2023 00:59:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=A0=E9=99=A4=E4=B8=8D=E6=8E=89BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/jlw/courseInfo/courseConfigureNew.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
index c0fecfd5..1c66c2a5 100644
--- a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
+++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
@@ -49,6 +49,11 @@
         border-radius: 5px;
         padding: 3px
     }
+    /*select超出展示*/
+    #edit_dialog {
+        position: relative;
+        overflow: visible !important;
+    }
 </style>
 <input name="courseInfoId" type="hidden" value="${courseInfo.courseInfoId}"/>
 <div class="layui-row" style="margin: 0 auto;">
@@ -460,9 +465,14 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
                     addOpen(id,title,data,param);
                 }
             }else if (obj.event === 'del') {
+                var url = "/jlw/courseInfo/delete.json",param = {ids:courseInfoId};
+                if (courseInfoId == 0){
+                    url = "/jlw/resourcesInfo/delete.json"
+                    param.ids = obj.data.resourcesInfoId;
+                }
                 layer.confirm('是否确定删除该信息？', function (index) {
                     layer.load();
-                    var ret = Common.postAjax("/jlw/courseInfo/delete.json",{ids:courseInfoId});
+                    var ret = Common.postAjax(url,param);
                     layer.msg(ret.code == 0 ? "删除成功！" : ret.msg, {
                         offset: ['50%'],
                         icon: ret.code == 0 ? 1 : 2,