Merge remote-tracking branch 'origin/master'

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/StudentFaceInfoApi.java

@@ -43,8 +43,8 @@ public class StudentFaceInfoApi {
 
     @ApiOperation(value = "按身份证查询", notes = "查询")
     @GetMapping("/identityNumber")
-    public ResponseEntity findByIdentityNumber(@RequestParam String identityNumber) {
-        Student student = studentRepo.findByIdentityNumber(identityNumber);
+    public ResponseEntity findByIdentityNumber(@RequestParam String identityNumber, @RequestParam Long orgId) {
+        Student student = studentRepo.findByIdentityNumberAndRootOrgId(identityNumber, orgId);
         if (student == null) {
             return new ResponseEntity(new ErrorMsg("该学生不存在"), HttpStatus.OK);
         }

core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/StudentService.java

@@ -131,7 +131,7 @@ public class StudentService {
                 }
             }
 
-            Student entity = studentRepo.findByIdentityNumberAndRootOrgId(student.getIdentityNumber(),student.getRootOrgId());
+            Student entity = studentRepo.findByIdentityNumberAndRootOrgId(student.getIdentityNumber(), student.getRootOrgId());
             if (entity != null) {//身份证查找不为空，更新学号
                 entity.setStudentCode(student.getStudentCode());
                 entity.setUpdateTime(new Date());
@@ -148,9 +148,9 @@ public class StudentService {
             user.setEnable(student.getUser().getEnable() == null ? true : student.getUser().getEnable());
             String password = null;
             if (!StringUtils.isEmpty(student.getIdentityNumber())) {//身份证号后6位
-                if(!StringUtils.isEmpty(student.getStudentCode())){
+                if (!StringUtils.isEmpty(student.getStudentCode())) {
                     user.setLoginName(student.getStudentCode());
-                }else{
+                } else {
                     user.setLoginName(student.getIdentityNumber());
                 }
                 password = student.getIdentityNumber().substring(student.getIdentityNumber().length() - 6, student.getIdentityNumber().length());
@@ -188,7 +188,7 @@ public class StudentService {
             student = studentRepo.findByUserRootOrgIdAndStudentCode(org.getId(), loginName);
         }
         if (LoginType.IDENTITY_NUMBER.equals(loginType)) {
-            student = studentRepo.findByIdentityNumberAndRootOrgId(loginName,org.getId());
+            student = studentRepo.findByIdentityNumberAndRootOrgId(loginName, org.getId());
         }
         if (student == null) {
             throw new RuntimeException("该用户不存在");
@@ -211,18 +211,19 @@ public class StudentService {
             UserInfo userInfo = userService.getUserInfo(student.getUser(), token);
             userInfo.setStudentId(student.getId());
             userInfo.setIdentityNumber(student.getIdentityNumber());
+            userInfo.setStudentCode(student.getStudentCode());
             return userInfo;
         }
     }
 
-	public Student update(Student student) {
-    	student.setUpdateTime(new Date());
+    public Student update(Student student) {
+        student.setUpdateTime(new Date());
         User user = userRepo.findOne(student.getUser().getId());
         user.setName(student.getName());
         student.setUser(user);
         student = studentRepo.save(student);
         dataSendService.sendStudent(student);
-		return student;
-	}
+        return student;
+    }
 
 }

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dto/UserInfo.java

@@ -8,13 +8,13 @@ import java.util.List;
 /**
  * Created by songyue on 17/2/22.
  */
-public class UserInfo implements Serializable{
+public class UserInfo implements Serializable {
     private static final long serialVersionUID = 7939545789907406883L;
 
     private Long userId;
-    
+
     private Long orgId;
-    
+
     private Long rootOrgId;
 
     private String name;
@@ -32,11 +32,13 @@ public class UserInfo implements Serializable{
     private String rootOrgName;
 
     private String rootOrgLogo;
-    
+
     private Long studentId;
-    
+
     private String identityNumber;
 
+    private String studentCode;
+
     private List<UserRole> userRoles;
 
     private List<String> roleNames;
@@ -118,38 +120,38 @@ public class UserInfo implements Serializable{
     }
 
     public Long getOrgId() {
-		return orgId;
-	}
+        return orgId;
+    }
 
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
 
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
 
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
 
-	public Long getStudentId() {
-		return studentId;
-	}
+    public Long getStudentId() {
+        return studentId;
+    }
 
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
 
     public String getIdentityNumber() {
-		return identityNumber;
-	}
+        return identityNumber;
+    }
 
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
 
-	public List<UserRole> getUserRoles() {
+    public List<UserRole> getUserRoles() {
         return userRoles;
     }
 
@@ -165,6 +167,14 @@ public class UserInfo implements Serializable{
         this.roleNames = roleNames;
     }
 
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
     public UserInfo() {
     }
 }