From 06e4f22195bbcc0fe8ff04de41d632ed71bb9a35 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 17 Mar 2023 20:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/common/courseInfoSelect.html    | 45 +++++++++++--------
 .../jlw/resourcesQuestion/index.html          |  2 +-
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/web/src/main/resources/templates/common/courseInfoSelect.html b/web/src/main/resources/templates/common/courseInfoSelect.html
index b141d184..2561ac18 100644
--- a/web/src/main/resources/templates/common/courseInfoSelect.html
+++ b/web/src/main/resources/templates/common/courseInfoSelect.html
@@ -3,8 +3,9 @@
    查询已经授权的课程
 
    条件：
-   name 标签的name值；
-   id 标签的ID值。
+   name         标签的name值;
+   id           标签的ID值;
+   filterName   过滤的分类名称，多个逗号隔开；只支持【应用课程类】、【理论课程类】、【考证课程类】
 */
 var newId = !isEmpty(id) ? id : ('select_id_' + name  + '_' + @cn.hutool.core.util.RandomUtil.randomString(10));
 -->
@@ -41,27 +42,33 @@ var newId = !isEmpty(id) ? id : ('select_id_' + name  + '_' + @cn.hutool.core.ut
     
     var ele = $('#${newId}');
 
-    ele.append('<optgroup label="应用课程类">');
-    for (let currentAuthCourseInfoDetail of applicationCourseList) {
-        ele.append(
-            '<option value="'+ (currentAuthCourseInfoDetail.courseInfoId || '-1') +'">'+ (currentAuthCourseInfoDetail.courseInfoName || '未查询到数据') +'</option>')
-    }
-    ele.append('</optgroup>');
-
+    var filterNames = '${filterName!""}';
 
-    ele.append('<optgroup label="理论课程类">');
-    for (let currentAuthCourseInfoDetail of theoryCourseList) {
-        ele.append(
-            '<option value="'+ (currentAuthCourseInfoDetail.courseInfoId || '-1') +'">'+ (currentAuthCourseInfoDetail.courseInfoName || '未查询到数据') +'</option>')
+    if (filterNames.indexOf('应用课程类') >= 0 || filterNames === "") {
+        ele.append('<optgroup label="应用课程类">');
+        for (let currentAuthCourseInfoDetail of applicationCourseList) {
+            ele.append(
+                '<option value="'+ (currentAuthCourseInfoDetail.courseInfoId || '-1') +'">'+ (currentAuthCourseInfoDetail.courseInfoName || '未查询到数据') +'</option>')
+        }
+        ele.append('</optgroup>');
     }
-    ele.append('</optgroup>');
 
+    if (filterNames.indexOf('理论课程类') >= 0 || filterNames === "") {
+        ele.append('<optgroup label="应用课程类">');
+        for (let currentAuthCourseInfoDetail of theoryCourseList) {
+            ele.append(
+                '<option value="'+ (currentAuthCourseInfoDetail.courseInfoId || '-1') +'">'+ (currentAuthCourseInfoDetail.courseInfoName || '未查询到数据') +'</option>')
+        }
+        ele.append('</optgroup>');
+    }
 
-    ele.append('<optgroup label="考证课程类">');
-    for (let currentAuthCourseInfoDetail of textualResearchCourseList) {
-        ele.append(
-            '<option value="'+ (currentAuthCourseInfoDetail.courseInfoId || '-1') +'">'+ (currentAuthCourseInfoDetail.courseInfoName || '未查询到数据') +'</option>')
+    if (filterNames.indexOf('考证课程类') >= 0 || filterNames === "") {
+        ele.append('<optgroup label="考证课程类">');
+        for (let currentAuthCourseInfoDetail of textualResearchCourseList) {
+            ele.append(
+                '<option value="'+ (currentAuthCourseInfoDetail.courseInfoId || '-1') +'">'+ (currentAuthCourseInfoDetail.courseInfoName || '未查询到数据') +'</option>')
+        }
+        ele.append('</optgroup>');
     }
-    ele.append('</optgroup>');
 
 </script>
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html
index e8ec31a5..e8ebb7f7 100644
--- a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html
@@ -28,7 +28,7 @@
             <!--#// 注释 -->
 
             <!--#// 查询授权的课程列表。自动根据身份判断 -->
-            <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
+            <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "", "filterName": "应用课程类"}) {} -->
         </div>
     </div>
     <div class="layui-inline">