管乐迷曲目来源内容平台

mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -343,7 +343,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("subject/findSubSubjects")
     public Object findSubSubjects(){
-        return succeed(subjectService.findSubSubjects(null));
+        return succeed(subjectService.findSubSubjects(null,null));
     }
 
     @ApiOperation(value = "获取用户所在分部的年级列表）")

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherSubjectController.java

@@ -44,6 +44,6 @@ public class TeacherSubjectController extends BaseController {
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("/findSubSubjects")
     public HttpResponseResult<List<Subject>> findSubSubjects(Integer tenantId){
-        return succeed(subjectService.findSubSubjects(null));
+        return succeed(subjectService.findSubSubjects(null,null));
     }
 }

mec-application/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -103,8 +103,8 @@ public class SubjectController extends BaseController {
     @ApiOperation(value = "获取子集科目列表按父Id")
     @GetMapping("/findSubSubjects")
     @PreAuthorize("@pcs.hasPermissions('subject/findSubSubjects')")
-    public HttpResponseResult<List<Subject>> findSubSubjects(Integer parentSubjectId){
-        return succeed(subjectService.findSubSubjects(parentSubjectId));
+    public HttpResponseResult<List<Subject>> findSubSubjects(Integer parentSubjectId,Boolean cbsFlag){
+        return succeed(subjectService.findSubSubjects(parentSubjectId,cbsFlag));
     }
 
     @ApiOperation(value = "搜索按Id和名称")

mec-application/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -143,7 +143,7 @@ public class EduRepairController extends BaseController {
     @ApiOperation("获取乐器种类")
     @GetMapping(value = "/findSubSubjects")
     public HttpResponseResult findSubSubjects() {
-        return succeed(subjectService.findSubSubjects( null));
+        return succeed(subjectService.findSubSubjects( null,null));
     }
 
     @ApiOperation("获取学生信息")

mec-application/src/main/java/com/ym/mec/web/controller/education/EduSubjectController.java

@@ -24,7 +24,7 @@ public class EduSubjectController extends BaseController {
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("/findSubSubjects")
     public Object findSubSubjects(Integer tenantId){
-        return succeed(subjectService.findSubSubjects(null));
+        return succeed(subjectService.findSubSubjects(null,null));
     }
 
     @ApiOperation(value = "根据科目编号查询科目")

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectDao.java

@@ -91,7 +91,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      *
      * @return
      */
-    List<Subject> findSubSubjects(@Param("parentSubjectId") Integer parentSubjectId);
+    List<Subject> findSubSubjects(@Param("parentSubjectId") Integer parentSubjectId, @Param("cbsFlag") Boolean cbsFlag);
 
     List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
 

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectService.java

@@ -79,7 +79,7 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * 获取子级科目列表
      * @return
      */
-    List<Subject> findSubSubjects(Integer parentSubjectId);
+    List<Subject> findSubSubjects(Integer parentSubjectId,Boolean cbsFlag);
 
     List<Subject> findBySubjectByIdList(List<Integer> subjectIdList);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectServiceImpl.java

@@ -210,8 +210,8 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     }
 
     @Override
-    public List<Subject> findSubSubjects(Integer parentSubjectId) {
-        return subjectDao.findSubSubjects(parentSubjectId);
+    public List<Subject> findSubSubjects(Integer parentSubjectId,Boolean cbsFlag) {
+        return subjectDao.findSubSubjects(parentSubjectId,cbsFlag);
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -139,6 +139,9 @@
             <if test="parentSubjectId != null and parentSubjectId != ''">
                 AND parent_subject_id_ = #{parentSubjectId}
             </if>
+            <if test="cbsFlag != null and cbsFlag == true">
+                AND cbs_subject_id_ IS NOT NULL
+            </if>
         </where>
     </select>