Merge remote-tracking branch 'origin/ywx' into wn

sexam/src/main/java/com/xhkjedu/sexam/service/exam/ESubjectBadstudentService.java

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -162,17 +161,23 @@ public class ESubjectBadstudentService {
             if (claMap == null) {
                 schoolClasses = new ArrayList<>();
             } else if (claMap.get("majored").equals(0)) {//教师不是主监考
-                List<Map> classes2 = new ArrayList<>();
                 classids = claMap.get("classids").toString();
                 String[] classIds = classids.split(",");
 
                 List<Map> schoolClasses2 = new ArrayList<>();
                 for(Map scMap : schoolClasses){
+                    List<Map> classes2 = new ArrayList<>();
                     List<Map> classMap = (List<Map>) scMap.get("classes");//获取学校下班级
-                    List<Map> teacherClassMap = classMap.stream().filter(c -> Arrays.asList(classIds).contains(c.get("classid").toString())).collect(Collectors.toList());
-                    if(N_Utils.isListNotEmpty(teacherClassMap)){
-                        scMap.put("classes",teacherClassMap);
+                    for (String classid : classIds) {
+                        for (Map cla : classMap) {
+                            if(cla.get("classid").toString().equals(classid)){
+                                classes2.add(cla);
+                                break;
+                            }
+                        }
                     }
+                    if(N_Utils.isListEmpty(classes2)) continue;
+                    scMap.put("classes",classes2);
                     schoolClasses2.add(scMap);
                 }