|
@@ -94,10 +94,17 @@ public class SubjectController extends BaseController {
|
|
|
return succeed(subjectService.findSubApplyDetail(musicGroupId));
|
|
|
}
|
|
|
|
|
|
- @ApiOperation(value = "获取子集科目列表")
|
|
|
+ @ApiOperation(value = "获取子集科目列表按父Id")
|
|
|
@GetMapping("/findSubSubjects")
|
|
|
@PreAuthorize("@pcs.hasPermissions('subject/findSubSubjects')")
|
|
|
- public Object findSubSubjects(Integer tenantId){
|
|
|
- return succeed(subjectService.findSubSubjects(tenantId));
|
|
|
+ public Object findSubSubjects(Integer parentSubjectId){
|
|
|
+ return succeed(subjectService.findSubSubjects(parentSubjectId));
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value = "搜索按Id和名称")
|
|
|
+ @GetMapping("/search")
|
|
|
+ @PreAuthorize("@pcs.hasPermissions('subject/search')")
|
|
|
+ public Object search(String search){
|
|
|
+ return succeed(subjectService.search(search));
|
|
|
}
|
|
|
}
|