Merge branch 'zx_saas_cbs' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -228,15 +228,15 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             if (subjectIds.size() > 0) {
                 String ids = StringUtils.join(subjectIds, ",");
                 subjectMap = MapUtil.convertMybatisMap(subjectDao.findBySubjecIds(ids));
-            }
+            }*/
             Map<Integer, String> map = new HashMap<>(categoriesIds.size());
             for (Integer categoriesId : categoriesIds) {
                 if(null != categoriesId){
                     map.put(categoriesId, getParentTreeName(categoriesId));
                 }
-            }*/
+            }
             for (SysMusicScore row : records) {
-//                row.setCategoriesName(map.get(row.getMusicScoreCategoriesId()));
+                row.setCategoriesName(map.get(row.getMusicScoreCategoriesId()));
                 row.setOrganName(organMap.get(row.getMusicScoreCategoriesId()));
 //                row.setSubjectName(subjectMap.get(row.getSubjectId()));
             }

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

@@ -309,7 +309,7 @@
     <select id="findByNames" resultMap="Subject">
         SELECT * FROM `subject` where name_ IN ('长笛','单簧管','萨克斯','小号','长号','圆号','上低音号','大号','打击乐') and del_flag_ = 0
     </select>
-    <select id="queryCbsList" resultType="com.ym.mec.biz.dal.entity.Subject">
+    <select id="queryCbsList" resultMap="Subject">
         SELECT * FROM `subject` WHERE del_flag_ = 0 AND parent_subject_id_ != 0
         <if test="cbsSubjectIds != null and cbsSubjectIds.size > 0">
             AND cbs_subject_id_ IN