Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -963,10 +963,10 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 studentFamily.setRailwayStation(dataMaps.get(83).toString());//离家最近火车站
             }
 
-            if(user.getId() == null){
-                insertStudentUserList.add(user);
-            }else{
+            if(studentUserMap.containsKey(credentialNumber)){
                 updateStudentUserList.add(user);
+            }else{
+                insertStudentUserList.add(user);
             }
 
             if(baseStudent.getId() == null){