diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java index 9e4d896..26857f3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java @@ -425,12 +425,7 @@ public class YxVolunteerServiceImpl extends ServiceImpl volunteerRecordEarlyAdmissionList = activeByCreateVolunteerDto.getVolunteerRecordEarlyAdmissionList(); - List volunteerRecordUndergraduateAList = activeByCreateVolunteerDto.getVolunteerRecordUndergraduateAList(); - List volunteerRecordUndergraduateBList = activeByCreateVolunteerDto.getVolunteerRecordUndergraduateBList(); List volunteerRecordUndergraduateList = activeByCreateVolunteerDto.getVolunteerRecordUndergraduateList(); - // 将本科批合并 - volunteerRecordUndergraduateList.addAll(volunteerRecordUndergraduateAList); - volunteerRecordUndergraduateList.addAll(volunteerRecordUndergraduateBList); volunteerRecordUndergraduateList.addAll(volunteerRecordEarlyAdmissionList); String volunteerId = activeByCreateVolunteerDto.getId(); YxCalculationMajor calculationMajor = null;