Merge branch 'music_score_zouxuan' of http://git.dayaedu.com/yonge/mec into mec_update_2021-11-02

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

@@ -96,6 +96,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 					sysMusicScoreCategoriesDao.update(categories);
 					return;
 				}
+				categoriesId = categories.getParentId();
 			}
 		}
 	}
@@ -122,6 +123,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 					sysMusicScoreCategoriesDao.update(categories);
 					return;
 				}
+				categoriesId = categories.getParentId();
 			}
 		}
 	}

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

@@ -10,6 +10,7 @@
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
 		<result column="categories_name_" property="categoriesName" />
+		<result column="music_score_categories_id_" property="musicScoreCategoriesId" />
 		<result column="categories_id_" property="categoriesId" />
 		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="subject_ids_" property="subjectIds" />