学校

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/basicteachingplan/FgBasicTeachingPlanServiceImpl.java

@@ -487,8 +487,8 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 		}
 		startPage(pageParam);
 		List<SuperviseVo> list = fgBasicTeachingPlanMapper.superviseList(form);
-		List<SuperviseVo> vList = new ArrayList<SuperviseVo>();
-		list.forEach(vo ->{
+		for (int i = list.size() - 1; i >= 0; i--) {
+			SuperviseVo vo = list.get(i);
 			//获取学校信息
 			CallBack<School> callback = bgMemberClient.getByOid(vo.getRelationId());
 			if(callback.isStatus()){
@@ -503,11 +503,14 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
 					btp.setAcademicLevel(vo.getAcademicLevel());
 					List<BasicTeachingPlan> voList = fgBasicTeachingPlanMapper.select(btp);
 					vo.setStatus(voList.get(0).getStatus());
-					vList.add(vo);
+				}else{
+					list.remove(i);
 				}
 			}
-		});
-		return new PageInfo<SuperviseVo>(vList);
+		}
+
+		return new PageInfo<SuperviseVo>(list);
+
 	}
 	
 	@Override