From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 4ebc65a..53396b0 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -95,7 +95,7 @@
if (1==user.getIsTrain()){
return R.data(201,"已报名，不能重复报名");
}
- if (2==user.getIsTrain() || -1==user.getIsTrain()){
+ if (2==user.getIsTrain() || -1==user.getIsTrain() || 3==user.getIsTrain()){
//已报名
trainingRegistration.setCancel(1);
//默认为未考试状态
@@ -133,9 +133,6 @@
return R.data(200,"取消报名成功");
}
}else {
- if (user.getIsTrain()==2) {
- return R.data(201,"尚未报名");
- }
if(user.getIsTrain()==1){
trainingRegistration.setCancel(2);
boolean status = trainingRegistrationService.updateById(trainingRegistration);
@@ -145,6 +142,8 @@
if (status){
return R.data(200,"取消报名成功");
}
+ }else {
+ return R.data(201,"尚未报名");
}
}
@@ -174,7 +173,7 @@
user.setIsTrain(1);
userService.updateById(user);
}else {
- if (user.getIsTrain()==2 || -1==user.getIsTrain()) {
+ if (user.getIsTrain()==2 || -1==user.getIsTrain() || 3==user.getIsTrain()) {
TrainingRegistration trainingRegistration1 = new TrainingRegistration();
trainingRegistration1.setCancel(1);
//默认为未考试状态
--
Gitblit v1.9.3