Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRegistrationController.java

@@ -95,6 +95,11 @@ public class ExamRegistrationController extends BaseController {
     @ApiOperation(value = "修改学员报名信息")
     @PostMapping(value = "update")
     public HttpResponseResult update(@RequestBody ExamRegistration examRegistration) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(sysUser)){
+            return failed("用户信息异常");
+        }
+        examRegistration.setStudentId(sysUser.getId());
         examRegistrationService.updateExamRegistration(examRegistration);
         return succeed();
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -313,7 +313,11 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         if (Objects.isNull(er)) {
             throw new BizException("学员报名信息有误");
         }
-        examRegistration.setStatus(null);
+        if(er.getStudentId().equals(examRegistration.getStudentId())){
+            examRegistration.setStatus(StudentRegistrationStatusEnum.AUDIT_WAIT);
+        }else{
+            examRegistration.setStatus(null);
+        }
         examRegistrationDao.update(examRegistration);
     }