专业年级班级树调整

src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -1072,6 +1072,8 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
         Set<Long> gradeIds = majorSetList.stream().map(BaseClassMajorSetVo::getGradeId).collect(Collectors.toSet());
         Set<Long> majorSetIds = majorSetList.stream().map(BaseClassMajorSetVo::getMajorId).collect(Collectors.toSet());
 
+        Map<Long, Map<Long, List<BaseClassMajorSetVo>>> classMap = majorSetList.stream().collect(Collectors.groupingBy(BaseClassMajorSetVo::getMajorId, Collectors.groupingBy(BaseClassMajorSetVo::getGradeId)));
+
         List<BaseGrade> gradeList = baseGradeService.list(
                 new QueryWrapper<BaseGrade>().lambda()
                         .eq(BaseGrade::getDeleteMark, DeleteMark.NODELETE.getCode())
@@ -1107,7 +1109,12 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 setTreeType(2);
                 setParentId(node.getDepartmentId().toString());
             }});
+            Map<Long, List<BaseClassMajorSetVo>> gradeMap = classMap.get(node.getId());
             gradeList.forEach((DDD)->{
+                List<BaseClassMajorSetVo> list = gradeMap.get(DDD.getId());
+                if(list == null|| list.isEmpty() || list.size() == 0){
+                    return;
+                }
                 voList.add(new BaseDepMajorGradeClassStudenTreeVo(){{
                     setId(node.getId().toString()+"_"+DDD.getId().toString());
                     setName(DDD.getName());