|
@@ -1,12 +1,12 @@
|
|
|
package com.ym.mec.web.controller;
|
|
|
|
|
|
-import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
|
|
|
+import com.ym.mec.auth.api.entity.SysUser;
|
|
|
import com.ym.mec.biz.service.CbsMusicScoreCategoriesService;
|
|
|
-import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
|
|
|
+import com.ym.mec.biz.service.OrganizationService;
|
|
|
+import com.ym.mec.biz.service.SysUserService;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -22,7 +22,11 @@ public class SysMusicScoreCategoriesController extends BaseController {
|
|
|
@Resource
|
|
|
private CbsMusicScoreCategoriesService cbsMusicScoreCategoriesService;
|
|
|
@Resource
|
|
|
- private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
|
|
|
+ private SysUserService sysUserService;
|
|
|
+// @Resource
|
|
|
+// private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
|
|
|
+ @Resource
|
|
|
+ private OrganizationService organizationService;
|
|
|
// @Autowired
|
|
|
// private OrganizationService organizationService;
|
|
|
/*
|
|
@@ -71,8 +75,9 @@ public class SysMusicScoreCategoriesController extends BaseController {
|
|
|
@GetMapping("/queryTree")
|
|
|
@PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/queryTree')")
|
|
|
public Object queryTree() {
|
|
|
- //queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
|
|
|
- return succeed(cbsMusicScoreCategoriesService.queryTreeByAppId());
|
|
|
+ SysUser user = sysUserService.getUser();
|
|
|
+ String teachingMaterialIds = organizationService.getTeachingMaterialIds(organizationService.getEmployeeOrgan(null),user.getTenantId());
|
|
|
+ return succeed(cbsMusicScoreCategoriesService.queryCategoriesTreeList(teachingMaterialIds,true));
|
|
|
}
|
|
|
|
|
|
/* @ApiOperation(value = "获取分类详情")
|