update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/dto/MusicScoreQueryInfo.java

@@ -8,6 +8,16 @@ public class MusicScoreQueryInfo {
 
     private String organId;
 
+    private Boolean enable;
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getOrganId() {
         return organId;
     }

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicScoreCategories> {
 
-    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId,@Param("organId") String organId);
+    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId,@Param("organId") String organId, @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/SysMusicScoreAccompanimentServiceImpl.java

@@ -70,6 +70,8 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 				categoriesId = Integer.parseInt(queryInfo.getCategoriesId());
 			}
 			musicScoreQueryInfo.setParentId(categoriesId);
+			musicScoreQueryInfo.setEnable(queryInfo.getEnable());
+			musicScoreQueryInfo.setOrganId(queryInfo.getOrganId());
 			List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesService.queryTree(musicScoreQueryInfo);
 			if(scoreCategories.size() > 0){
 				categoriesIdList = scoreCategories.stream().map(e->e.getId()).collect(Collectors.toList());
@@ -117,6 +119,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 			}
 			musicScoreQueryInfo.setParentId(categoriesId);
 			musicScoreQueryInfo.setOrganId(queryInfo.getOrganId());
+			musicScoreQueryInfo.setEnable(queryInfo.getEnable());
 			List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesService.queryTree(musicScoreQueryInfo);
 			if(scoreCategories.size() > 0){
 				categoriesIdList = scoreCategories.stream().map(e->e.getId()).collect(Collectors.toList());

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

@@ -37,8 +37,8 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 
 	@Override
 	public List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo) {
-		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getOrganId());
-		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getOrganId());
+		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
+		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
 		for (SysMusicScoreCategories categories : scoreCategories) {
 			categories = getTree(categories,scoreCategoriesAllList);
 		}

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

@@ -160,6 +160,9 @@
 	</select>
 	<sql id="queryTree">
 		<where>
+			<if test="enable != null">
+				AND sm.enable_ = #{enable}
+			</if>
 			<if test="parentId != null">
 				AND sm.parent_id_ = #{parentId}
 			</if>

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreAccompanimentController.java

@@ -44,6 +44,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         }
         queryInfo.setShowFlag(1);
         queryInfo.setOrganId(sysUser.getOrganId().toString());
+        queryInfo.setEnable(true);
         return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
     }
 

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

@@ -36,6 +36,7 @@ public class SysMusicScoreCategoriesController extends BaseController {
     public Object queryTree(MusicScoreQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         queryInfo.setOrganId(sysUser.getOrganId().toString());
+        queryInfo.setEnable(true);
         return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
     }
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -91,6 +91,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         }
         queryInfo.setCreateUserId(sysUser.getId());
         queryInfo.setShowFlag(1);
+        queryInfo.setEnable(true);
         return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
     }
 }

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

@@ -51,6 +51,7 @@ public class SysMusicScoreCategoriesController extends BaseController {
         if(StringUtils.isNotBlank(teacher.getFlowOrganRange())){
             queryInfo.setOrganId(queryInfo.getOrganId() + "," + teacher.getFlowOrganRange());
         }
+        queryInfo.setEnable(true);
         return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicScoreController.java

@@ -52,6 +52,7 @@ public class EduMusicScoreController extends BaseController {
                 return failed("非法请求");
             }
         }
+        queryInfo.setEnable(true);
         return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
     }
 
@@ -88,6 +89,7 @@ public class EduMusicScoreController extends BaseController {
                 return failed("非法请求");
             }
         }
+        queryInfo.setEnable(true);
         return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
     }