--no commit message

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicBasicRelationServiceImpl.java

@@ -140,12 +140,13 @@ public class FgPublicBasicRelationServiceImpl extends BaseServiceImpl<PublicBasi
 						}
 					}
 					
-					voList.forEach(vo ->{
-						this.queryVo(vo,biddingCycle,query.getData().getId(),vo.getSemester());
-					});
+					
 //					voList.stream().filter(a -> a.getSemester().equals(this.getAcr(a.getAcademicLevel(), basicList))).forEach(vo ->{
 //						this.queryVo(vo,biddingCycle,query.getData().getId(),vo.getSemester());
 //					});
+					voList.forEach(vo ->{
+						this.queryVo(vo,biddingCycle,query.getData().getId(),vo.getSemester());
+					});
 				}
 			}else{
 				voList = fgBasicTeachingPlanMapper.getList(time,form);