|
@@ -142,11 +142,12 @@ public class StudentService {
|
|
|
User user = new User(student.getName(), UserScope.ORG, student.getUser().getRootOrgId(), student.getUser().getOrgId(), UserType.STUDENT);
|
|
|
user.setEnable(student.getUser().getEnable() == null ? true : student.getUser().getEnable());
|
|
|
String password = null;
|
|
|
- if (!StringUtils.isEmpty(student.getStudentCode())) {//学号后6位
|
|
|
- user.setLoginName(student.getStudentCode());
|
|
|
- password = student.getStudentCode().substring(student.getStudentCode().length() - 6, student.getStudentCode().length());
|
|
|
- } else {//身份证号后6位
|
|
|
- user.setLoginName(student.getIdentityNumber());
|
|
|
+ if (!StringUtils.isEmpty(student.getIdentityNumber())) {//身份证号后6位
|
|
|
+ if(!StringUtils.isEmpty(student.getStudentCode())){
|
|
|
+ user.setLoginName(student.getStudentCode());
|
|
|
+ }else{
|
|
|
+ user.setLoginName(student.getIdentityNumber());
|
|
|
+ }
|
|
|
password = student.getIdentityNumber().substring(student.getIdentityNumber().length() - 6, student.getIdentityNumber().length());
|
|
|
}
|
|
|
user.setPassword(password);
|