diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java index 01b232aa3b..6e42b0c56d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java @@ -288,7 +288,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl signUpNum) { + if (!actInfoEntity.getActQuotaCategory() || actInfoEntity.getActQuota() > signUpNum) { // 我要报名(不限名额或者未报满的) return ActConstant.CURRENT_STATUS_USER_SIGN_UP; } else { @@ -336,7 +336,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl= actInfoEntity.getActQuota()) { + if (actInfoEntity.getActQuotaCategory() && signUpNum >= actInfoEntity.getActQuota()) { return ActConstant.CURRENT_STATUS_USER_ENOUGH; } // (报名审核未通过或者已经取消报名的)可再次报名-我要报名