教学伴奏加声部和分部

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

@@ -23,5 +23,5 @@ public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicSco
 
     void enable(@Param("categoriesIds") String categoriesIds, @Param("enable") boolean enable);
 
-    List<Map<Integer, String>> querOrganByIds(@Param("categoriesIds") Set<Integer> categoriesIds);
+    List<Map<Integer, String>> queryOrganByIds(@Param("categoriesIds") Set<Integer> categoriesIds);
 }

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

@@ -161,7 +161,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 		if(rows != null && rows.size() > 0){
 			Set<Integer> categoriesIds = rows.stream().map(e -> e.getMusicScoreCategoriesId()).collect(Collectors.toSet());
 			//获取分部列表
-			Map<Integer,String> organMap = MapUtil.convertMybatisMap(sysMusicScoreCategoriesDao.querOrganByIds(categoriesIds));
+			Map<Integer,String> organMap = MapUtil.convertMybatisMap(sysMusicScoreCategoriesDao.queryOrganByIds(categoriesIds));
 			//获取声部列表
 			Set<Integer> subjectIds = rows.stream().map(e -> e.getSubjectId()).collect(Collectors.toSet());
 			subjectIds.removeAll(Collections.singleton(null));

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

@@ -161,8 +161,8 @@
 		SELECT GROUP_CONCAT(id_) FROM sys_music_score_categories
 		WHERE FIND_IN_SET(id_,#{categoriesIds}) OR FIND_IN_SET(parent_id_,#{categoriesIds})
 	</select>
-    <select id="querOrganByIds" resultType="java.util.Map">
-		SELECT sms.id_ 'key',o.name_ 'value' FROM sys_music_score_categories sms
+    <select id="queryOrganByIds" resultType="java.util.Map">
+		SELECT sms.id_ 'key',GROUP_CONCAT(DISTINCT o.name_) 'value' FROM sys_music_score_categories sms
 		LEFT JOIN organization o ON FIND_IN_SET(o.id_,sms.organ_id_)
 		WHERE sms.id_ IN
 		<foreach collection="categoriesIds" item="id" open="(" close=")" separator=",">

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

@@ -92,7 +92,7 @@ public class SysMusicScoreController extends BaseController {
             }
         }
         if(queryInfo.getCategoriesId() != null){
-            String byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(queryInfo.getCategoriesId().toString());
+            String byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(queryInfo.getCategoriesId());
             byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(byCategoriesIds);
             queryInfo.setCategoriesId(byCategoriesIds);
         }