学生导入完善

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/ClassStudentService.java

@@ -475,10 +475,12 @@ public class ClassStudentService {
                         Integer studentid = u.getUserid();
                         Integer oldclassid = classStudentMapper.getClassIdByStuId(studentid);//获取学生行政班id
                         Integer classid = user.getClassid();
-                        if (!classid.equals(oldclassid) && 2 == u.getUsertype() && schoolid == u.getSchoolid()) {
-                            if (1 != u.getUserstate()) {
-                                delUsers.add(u);
-                            }
+                        if (1 != u.getUserstate()) {
+                            delUsers.add(u);
+                        } else {
+                            studentsExisted.add(u);
+                        }
+                        if (!classid.equals(oldclassid)) {
                             //要添加的班级
                             setStudents(classid, schoolid, createid, user.getGroupid(), classStudents, groupStudents, studentid);//处理班级加入学生
                             List<Map> courses = listCourseByClassId(courseMap, classid);
@@ -513,8 +515,6 @@ public class ClassStudentService {
                                 }
                                 handleDelClassCourse2(delStudentList, changeCourseidList, courses2, studentid);//处理关联的直播课以及需要删除学生的直播班id
                             }
-                        } else {//本班学生信息
-                            studentsExisted.add(u);
                         }
                     }
                 }
@@ -660,13 +660,15 @@ public class ClassStudentService {
                     Integer classnum = student.getClassnum();//本班级学生数量
                     if (2 != u.getUsertype() || schoolid != u.getSchoolid() || 0 == student.getXznum()) {
                         usersNotExisted.add(u);
-                    } else if (0 == classnum && 2 == u.getUsertype() && schoolid == u.getSchoolid()) {
+                    } else {
                         if (1 != u.getUserstate()) {
                             delUsers.add(u);
                         }
-                        setStudents(classid, schoolid, createid, user.getGroupid(), classStudents, groupStudents, studentid);//处理班级加入学生
-                        List<Map> courses = listCourseByClassId(courseMap, classid);
-                        handleAddClassCourse(classStudents, groupStudents, changeCourseidList, courses, studentid);//处理班级加入学生中关联的直播课加入学生
+                        if (0 == classnum) {
+                            setStudents(classid, schoolid, createid, user.getGroupid(), classStudents, groupStudents, studentid);//处理班级加入学生
+                            List<Map> courses = listCourseByClassId(courseMap, classid);
+                            handleAddClassCourse(classStudents, groupStudents, changeCourseidList, courses, studentid);//处理班级加入学生中关联的直播课加入学生
+                        }
                     }
                 }
             }