伴奏修改

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

@@ -113,8 +113,11 @@
 		SELECT sm.*,GROUP_CONCAT(o.name_) organ_name_ FROM sys_music_score_categories sm
 		LEFT JOIN organization o ON FIND_IN_SET(o.id_,sm.organ_id_)
 		<where>
+			<if test="organId != null and organId != ''">
+				AND FIND_IN_SET(sm.organ_id_,#{organId})
+			</if>
 			<if test="parentId != null">
-				sm.parent_id_ = #{parentId}
+				AND sm.parent_id_ = #{parentId}
 			</if>
 			<if test="enable != null">
 				AND sm.enable_ = #{enable}
@@ -132,6 +135,9 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(sm.id_) FROM sys_music_score_categories sm
 		<where>
+			<if test="organId != null and organId != ''">
+				AND FIND_IN_SET(sm.organ_id_,#{organId})
+			</if>
 			<if test="parentId != null">
 				sm.parent_id_ = #{parentId}
 			</if>

mec-web/src/main/java/com/ym/mec/web/controller/SysMusicScoreCategoriesController.java

@@ -37,6 +37,21 @@ public class SysMusicScoreCategoriesController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/queryPage')")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
         queryInfo.setParentId(0);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            return failed("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                return failed("非法请求");
+            }
+        }
         return succeed(sysMusicScoreCategoriesService.queryPage(queryInfo));
     }