commit

src/main/java/io/v/nutz/trainSignUp/controller/mobile/MTrainSignUpActivityController.java

@@ -277,7 +277,7 @@ public class MTrainSignUpActivityController {
             if(signFullByUnionId) {
                 return Result.error("该活动您所在的分工会名额已报满");
             }
-            if(course.getReserveMode() == 2 && currentFamilyNumber == null) {
+            if(Integer.valueOf(2).equals(course.getReserveMode()) && currentFamilyNumber == null) {
                 //课程已报人数
                 List<TrainSignUpUser> signUpUsers = dao.query(TrainSignUpUser.class, Cnd.where("courseId", "=", courseId));
                 int hasRegisterNum = signUpUsers.size() + 1;//+1是算自己

src/main/java/io/v/nutz/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java

@@ -336,7 +336,7 @@ public class TrainSignUpActivityServiceImpl extends ViServiceImpl<TrainSignUpAct
         TrainSignUpActivity activity = dao().fetch(TrainSignUpActivity.class, Cnd.where("id", "=", course.getActivityId()));
 
         //如果这个课程的预留名额方式为报名人数不变
-        if (course.getReserveMode() == 2) {
+        if (Integer.valueOf(2).equals(course.getReserveMode())) {
             //如果当前报名+已报小于这个课程限制人数
             //课程已报人数
             List<TrainSignUpUser> signUpUsers = dao().query(TrainSignUpUser.class, Cnd.where("courseId", "=", trainSignUpUser.getCourseId()));
@@ -487,7 +487,7 @@ public class TrainSignUpActivityServiceImpl extends ViServiceImpl<TrainSignUpAct
             hasFamilyNum = num.get() + (currentFamilyNumber != null ? currentFamilyNumber : 0);//currentFamilyNumber是当前报名时填的家属人数
         }
         //如果预留名额模式是报名人数减少
-        if (course.getReserveMode() == 1) {
+        if (course.getReserveMode() == null || course.getReserveMode() == 1) {
             //如果已报人数+预留人数+当前报名（自己）+家属 > 总人数
             return (hasRegisterNum + course.getCourseReservedNumber() + hasFamilyNum) > coursePeopleNumber;
         } else {//如果预留名额模式是报名人数不变