update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -326,18 +326,22 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	public PageInfo<Teacher> queryPageDetail(TeacherQueryInfo queryInfo) {
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+		List<Teacher> teacherList = teacherDao.findByFlowOrganRange(params);
+		if(teacherList == null || teacherList.size() < 1){
+			return new PageInfo<>();
+		}
 		if(StringUtils.isNotEmpty(queryInfo.getOrganId())){
 			Set<String> list = new HashSet<>(Arrays.asList(queryInfo.getOrganId().split(",")));
-			Map<String, Object> params = new HashMap<>();
-			MapUtil.populateMap(params, queryInfo);
-			List<Teacher> teacherList = teacherDao.findByFlowOrganRange(params);
-			List<Teacher> teachers = teacherList.stream().
+			teacherList = teacherList.stream().
 					filter(teacher -> !Collections.disjoint(new ArrayList<>(Arrays.asList(teacher.getFlowOrganRange().split(","))),list)).collect(Collectors.toList());
-			List<Integer> collect = teachers.stream().map(e -> e.getId()).collect(Collectors.toList());
-			if(collect != null && collect.size() > 0){
-				queryInfo.setTeacherId(collect);
-			}
 		}
+		List<Integer> collect = teacherList.stream().map(e -> e.getId()).collect(Collectors.toList());
+		if(collect == null || collect.size() < 1){
+			return new PageInfo<>();
+		}
+		queryInfo.setTeacherId(collect);
 
 		PageInfo<Teacher> pageInfo = queryPage(queryInfo);
 		List<Teacher> rows = pageInfo.getRows();