update

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

@@ -11,7 +11,7 @@ import java.util.Set;
 
 public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicScoreCategories> {
 
-    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId,@Param("organId") String organId, @Param("enable") Boolean enable);
+    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId,@Param("search") String search, @Param("enable") Boolean enable);
 
     void batchInsert(@Param("categoriesList") List<SysMusicScoreCategories> sysMusicScoreCategoriesList, @Param("organId") String organId, @Param("enable") Boolean enable);
 

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

@@ -35,8 +35,8 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 
 	@Override
 	public List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo) {
-		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
-		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
+		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getSearch(),menuQueryInfo.getEnable());
+		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getSearch(),menuQueryInfo.getEnable());
 		for (SysMusicScoreCategories categories : scoreCategories) {
 			int sum = getTree(categories, scoreCategoriesAllList);
 			categories.setMusicScoreNum(sum + categories.getMusicScoreNumSum());
@@ -57,7 +57,7 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 		SysMusicScoreCategories subCategory = null;
 		for(SysMusicScoreCategories smsc : categoryList){
 			
-			if(smsc == null){
+			if(smsc == null || smsc.getEnable() != true){
 				continue;
 			}
 			parentCategory = getParentTree(smsc);

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

@@ -191,9 +191,9 @@
 			<if test="parentId != null">
 				AND sm.parent_id_ = #{parentId}
 			</if>
-			<!-- <if test="organId != null">
-				AND INTE_ARRAY(#{organId},sm.organ_id_)
-			</if> -->
+			<if test="search != null and search != ''">
+				AND (sm.id_ like concat('%',#{search},'%') or sm.name_ like concat('%',#{search},'%'))
+			</if>
 		</where>
 	</sql>