diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtVolunteerController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtVolunteerController.java index 1215b98..eb0a043 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtVolunteerController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtVolunteerController.java @@ -327,7 +327,7 @@ public class ArtVolunteerController { // 获取专业列表 List volunteerRecordDTOList = yxVolunteerRecordService.listDTOByVolunteerIdS(id); // List volunteerRecordDTOList = yxVolunteerRecordService.listDTOByVolunteerId(id); - List benList = volunteerRecordDTOList.stream().filter(v -> v.getBatch().contains("本科")).collect(Collectors.toList()); + List benList = volunteerRecordDTOList.stream().filter(v -> v.getBatch().contains("提前")|| v.getBatch().contains("本科")).collect(Collectors.toList()); List zhuanList = volunteerRecordDTOList.stream().filter(v -> v.getBatch().contains("高职高专")).collect(Collectors.toList()); List> batchList = new ArrayList<>(); Map batchMap = null;