增加下拉框的功能

web/src/main/java/com/ibeetl/jlw/enums/AddTypeEnum.java

@@ -20,7 +20,7 @@ import org.beetl.sql.annotation.entity.EnumMapping;
 public enum AddTypeEnum {
 
     ADMIN_ADD("系统分配"),
-    FACULTY_ADD("院系上传");
+    FACULTY_ADD("院校上传");
 
     private String text;
 

web/src/main/resources/templates/common/courseInfoSelect.html

@@ -3,9 +3,10 @@
    查询已经授权的课程
 
    条件：
-   name         标签的name值;
-   id           标签的ID值;
-   filterName   过滤的分类名称，多个逗号隔开；只支持【应用课程类】、【理论课程类】、【考证课程类】
+   name             标签的name值;
+   id               标签的ID值;
+   isShowGroupName  显示分组名称（默认：true）;
+   filterName       过滤的分类名称，多个逗号隔开；只支持【应用课程类】、【理论课程类】、【考证课程类】，showGroupName为false也会过滤数据。
 */
 var newId = !isEmpty(id) ? id : ('select_id_' + name  + '_' + @cn.hutool.core.util.RandomUtil.randomString(10));
 -->
@@ -39,36 +40,40 @@ var newId = !isEmpty(id) ? id : ('select_id_' + name  + '_' + @cn.hutool.core.ut
      *   </optgroup>
      * </select>
      */
-    
-    var ele = $('#${newId}');
 
-    var filterNames = '${filterName!""}';
+    // jq选择器
+    var ele             = $('#${newId}');
+    // 过滤label
+    var filterNames     = '${filterName!""}';
+    // 显示分组名称
+    var isShowGroupName   = '${isShowGroupName!true}';
+
 
     if (filterNames.indexOf('应用课程类') >= 0 || filterNames === "") {
-        ele.append('<optgroup label="应用课程类">');
+        if (isShowGroupName === 'true') ele.append('<optgroup label="应用课程类">');
         for (let currentAuthCourseInfoDetail of applicationCourseList) {
             ele.append(
                 '<option value="'+ (currentAuthCourseInfoDetail.courseInfoId || '-1') +'">'+ (currentAuthCourseInfoDetail.courseInfoName || '未查询到数据') +'</option>')
         }
-        ele.append('</optgroup>');
+        if (isShowGroupName === 'true') ele.append('</optgroup>');
     }
 
     if (filterNames.indexOf('理论课程类') >= 0 || filterNames === "") {
-        ele.append('<optgroup label="理论课程类">');
+        if (isShowGroupName === 'true') ele.append('<optgroup label="理论课程类">');
         for (let currentAuthCourseInfoDetail of theoryCourseList) {
             ele.append(
                 '<option value="'+ (currentAuthCourseInfoDetail.courseInfoId || '-1') +'">'+ (currentAuthCourseInfoDetail.courseInfoName || '未查询到数据') +'</option>')
         }
-        ele.append('</optgroup>');
+        if (isShowGroupName === 'true') ele.append('</optgroup>');
     }
 
     if (filterNames.indexOf('考证课程类') >= 0 || filterNames === "") {
-        ele.append('<optgroup label="考证课程类">');
+        if (isShowGroupName === 'true') ele.append('<optgroup label="考证课程类">');
         for (let currentAuthCourseInfoDetail of textualResearchCourseList) {
             ele.append(
                 '<option value="'+ (currentAuthCourseInfoDetail.courseInfoId || '-1') +'">'+ (currentAuthCourseInfoDetail.courseInfoName || '未查询到数据') +'</option>')
         }
-        ele.append('</optgroup>');
+        if (isShowGroupName === 'true') ele.append('</optgroup>');
     }
 
 </script>

web/src/main/resources/templates/jlw/resourcesQuestion/index.html

@@ -28,7 +28,7 @@
             <!--#// 注释 -->
 
             <!--#// 查询授权的课程列表。自动根据身份判断 -->
-            <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "", "filterName": "应用课程类"}) {} -->
+            <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "", "isShowGroupName": "true"}) {} -->
         </div>
     </div>
     <div class="layui-inline">