wangwei 7 年之前
父节点
当前提交
f4fad87e45

+ 17 - 14
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/StudentServiceImpl.java

@@ -189,35 +189,38 @@ public class StudentServiceImpl implements StudentService {
 			}
 		}
 
-		Student updatedStudent = null;
+		Student student = null;
 		if (null != studentByIdentity) {
-			updatedStudent = studentByIdentity;
+			student = studentByIdentity;
 		} else {
-			updatedStudent = new Student();
+			student = new Student();
 			if (StringUtils.isNotEmpty(identityNumber)
 					&& identityNumber.matches("[0-9a-zA-Z]{6,}")) {
-				updatedStudent.setPassword(
+				student.setPassword(
 						StringUtils.substring(identityNumber, -6, identityNumber.length()));
 			} else {
-				updatedStudent.setPassword(Consts.DEFAULT_PASSWORD);
+				student.setPassword(Consts.DEFAULT_PASSWORD);
 			}
 		}
 
-		updatedStudent.setRootOrgId(rootOrgId);
-		updatedStudent.setName(studentInfo.getName());
-		updatedStudent.setIdentityNumber(identityNumber);
-		updatedStudent.setStudentCode(studentCode);
-		updatedStudent.setOrgId(orgId);
+		if (null == student.getEnable()) {
+			student.setEnable(true);
+		}
+		student.setRootOrgId(rootOrgId);
+		student.setName(studentInfo.getName());
+		student.setIdentityNumber(identityNumber);
+		student.setStudentCode(studentCode);
+		student.setOrgId(orgId);
 		if (StringUtils.isNotBlank(studentInfo.getPhotoPath())) {
-			updatedStudent.setPhotoPath(studentInfo.getPhotoPath());
+			student.setPhotoPath(studentInfo.getPhotoPath());
 		}
 		if (StringUtils.isNotBlank(studentInfo.getPhoneNumber())) {
-			updatedStudent.setPhoneNumber(studentInfo.getPhoneNumber());
+			student.setPhoneNumber(studentInfo.getPhoneNumber());
 		}
 		if (null != studentInfo.getRemark()) {
-			updatedStudent.setRemark(studentInfo.getRemark());
+			student.setRemark(studentInfo.getRemark());
 		}
-		Student saved = studentRepo.save(updatedStudent);
+		Student saved = studentRepo.save(student);
 
 		return saved;
 	}