历史班级
This commit is contained in:
@@ -1236,6 +1236,7 @@ public class ComSchTreeService implements IComSchTreeService {
|
||||
gradeNode.setSort(year);
|
||||
gradeNode.setExpand(true);
|
||||
|
||||
Integer enrollYear=year;
|
||||
// 构建班级子节点(schsystemId 传 null,班级节点不依赖学制)
|
||||
if (!CollectionUtils.isEmpty(classList)) {
|
||||
// 班级节点排序:按班级序号 sort 升序(班号顺序)
|
||||
@@ -1243,7 +1244,7 @@ public class ComSchTreeService implements IComSchTreeService {
|
||||
.sorted(Comparator.comparing(SchClass::getSort, Comparator.nullsLast(Integer::compareTo)))
|
||||
.collect(Collectors.toList());
|
||||
List<SchSystemTreeVO> classNodes = sortedClasses.stream()
|
||||
.map(clazz -> buildClassNode(clazz, clazz.getGradeId(), null, year))
|
||||
.map(clazz -> buildClassNode(clazz, clazz.getGradeId(), null,enrollYear ))
|
||||
.collect(Collectors.toList());
|
||||
gradeNode.setChildren(classNodes);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user