fengji 'tenantId'

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

@@ -41,6 +41,11 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null,menuQueryInfo.getOrganId(),menuQueryInfo.getEnable());
 		for (SysMusicScoreCategories categories : scoreCategories) {
 			categories = getTree(categories,scoreCategoriesAllList);
+			if (categories.getSysMusicScoreCategoriesList() != null) {
+				categories.setMusicScoreNum(categories.getSysMusicScoreCategoriesList().size());
+			} else {
+				categories.setMusicScoreNum(0);
+			}
 		}
 		return scoreCategories;
 	}
@@ -202,8 +207,13 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 			//将子节点list放入父节点对象
 			categories.setSysMusicScoreCategoriesList(scoreCategories);
 			//遍历子节点....
-			for (SysMusicScoreCategories sysMenu : scoreCategories) {
-				getTree(sysMenu,scoreCategoriesAllList);
+			for (SysMusicScoreCategories score : scoreCategories) {
+				getTree(score, scoreCategoriesAllList);
+				if (score.getSysMusicScoreCategoriesList() != null) {
+					score.setMusicScoreNum(score.getSysMusicScoreCategoriesList().size());
+				} else {
+					score.setMusicScoreNum(0);
+				}
 			}
 		}
 		return categories;

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

@@ -159,8 +159,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentInstrument">
-        SELECT *
-        FROM student where tenant_id_ = #{tenantId}
+        SELECT * FROM student where tenant_id_ = #{tenantId}
     </select>
 
     <!-- 分页查询 -->
@@ -182,7 +181,7 @@
 
     <sql id="queryPageSql">
         <where>
-        	tenant_id_ = #{tenantId}
+        	si.tenant_id_ = #{tenantId}
             <if test="studentId != null">
                 AND si.student_id_ = #{studentId}
             </if>