userclass/UserclassService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

历史班级

Browse Source
This commit is contained in:
wanghu
2026-08-27 18:51:47 +08:00
parent 290af59e9b
commit 23f1c2f8ae
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yunhai/bschclassmanage/service/impl/com/ComSchTreeService.java
+2 -1
View File
@@ -1236,6 +1236,7 @@ public class ComSchTreeService implements IComSchTreeService {
gradeNode.setSort(year); gradeNode.setSort(year);
gradeNode.setExpand(true); gradeNode.setExpand(true);
Integer enrollYear=year;
// 构建班级子节点（schsystemId 传 null，班级节点不依赖学制） // 构建班级子节点（schsystemId 传 null，班级节点不依赖学制）
if (!CollectionUtils.isEmpty(classList)) { if (!CollectionUtils.isEmpty(classList)) {
// 班级节点排序：按班级序号 sort 升序（班号顺序） // 班级节点排序：按班级序号 sort 升序（班号顺序）
@@ -1243,7 +1244,7 @@ public class ComSchTreeService implements IComSchTreeService {
.sorted(Comparator.comparing(SchClass::getSort, Comparator.nullsLast(Integer::compareTo))) .sorted(Comparator.comparing(SchClass::getSort, Comparator.nullsLast(Integer::compareTo)))
.collect(Collectors.toList()); .collect(Collectors.toList());
List<SchSystemTreeVO> classNodes = sortedClasses.stream() List<SchSystemTreeVO> classNodes = sortedClasses.stream()
.map(clazz -> buildClassNode(clazz, clazz.getGradeId(), null, year)) .map(clazz -> buildClassNode(clazz, clazz.getGradeId(), null,enrollYear ))
.collect(Collectors.toList()); .collect(Collectors.toList());
gradeNode.setChildren(classNodes); gradeNode.setChildren(classNodes);
} else { } else {