科目增加groupName

ie-admin/src/main/java/com/ruoyi/web/controller/learn/LearnTeacherController.java

@@ -84,8 +84,7 @@ public class LearnTeacherController extends BaseController {
     {
         DzSubject sCond = new DzSubject();
         sCond.setExamTypes(examType.name());
-        Set<Long> validSubjectIdSet = Sets.newHashSet(1L, 2L, 3L, 100L);
-        List<DzSubject> list = dzSubjectService.selectDzSubjectList(sCond).stream().filter(t -> validSubjectIdSet.contains(t.getSubjectId())).collect(Collectors.toList());
+        List<DzSubject> list = dzSubjectService.selectDzSubjectList(sCond);
         return AjaxResult2.success(list);
     }
 

ie-system/src/main/resources/mapper/dz/DzSubjectMapper.xml

@@ -11,10 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sort"    column="sort"    />
         <result property="locations"    column="locations"    />
         <result property="examTypes"    column="exam_types"    />
+        <result property="groupName"    column="group_name"    />
     </resultMap>
 
     <sql id="selectDzSubjectVo">
-        select subject_id, subject_name, pinyin, sort, locations, exam_types from dz_subject
+        select subject_id, subject_name, pinyin, sort, locations, exam_types, group_name from dz_subject
     </sql>
 
     <select id="selectDzSubjectBySubjectIds" resultMap="DzSubjectResult">