update

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

@@ -35,7 +35,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @param parentId
      * @return
      */
-    List<Subject> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag);
+    List<Subject> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag,@Param("tenantId")Integer tenantId);
 
     /**
      * 通过乐团收费类型，获取默认的声部列表

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

@@ -53,7 +53,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     public PageInfo<Subject> queryPageTree(SubjectQueryInfo queryInfo) {
         PageInfo<Subject> pageInfo = queryPage(queryInfo);
         for (Subject subject:pageInfo.getRows()) {
-            subject = getTree(subject,queryInfo.getDelFlag());
+            subject = getTree(subject,queryInfo.getDelFlag(),queryInfo.getTenantId());
         }
         return pageInfo;
     }
@@ -135,17 +135,17 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     }
 
 
-    private Subject getTree(Subject sub,YesOrNoEnum yesOrNoEnum){
+    private Subject getTree(Subject sub,YesOrNoEnum yesOrNoEnum,Integer tenantId){
         //得到根节点对象
         //获取子节点list
-        List<Subject> subjects = subjectDao.findByParentId(sub.getId(),yesOrNoEnum);
+        List<Subject> subjects = subjectDao.findByParentId(sub.getId(),yesOrNoEnum,tenantId);
         //如果存在子节点
         if(subjects != null && subjects.size() > 0) {
             //将子节点list放入父节点对象
             sub.setSubjects(subjects);
             //遍历子节点....
             for (Subject subject : subjects) {
-                getTree(subject,yesOrNoEnum);
+                getTree(subject,yesOrNoEnum,tenantId);
             }
         }
         return sub;