活动详情 状态修改

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<ActInfoDao, ActInfoEntit
     private String getCurrentUserStatusNotSignUp(ActInfoEntity actInfoEntity, Integer signUpNum, Date currentTime) {
         if (currentTime.before(actInfoEntity.getSignUpEndTime())) {
             /*报名结束前*/
-            if (Boolean.FALSE.equals(actInfoEntity.getActQuotaCategory()) || actInfoEntity.getActQuota() > signUpNum) {
+            if (!actInfoEntity.getActQuotaCategory() || actInfoEntity.getActQuota() > signUpNum) {
                 // 我要报名(不限名额或者未报满的)
                 return ActConstant.CURRENT_STATUS_USER_SIGN_UP;
             } else {
@@ -336,7 +336,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                 return ActConstant.ACT_USER_STATUS_CANCELD;
             }
             // 活动限制名额，且报名人数已满 已报满
-            if (Boolean.FALSE.equals(actInfoEntity.getActQuotaCategory()) && signUpNum >= actInfoEntity.getActQuota()) {
+            if (actInfoEntity.getActQuotaCategory() && signUpNum >= actInfoEntity.getActQuota()) {
                 return ActConstant.CURRENT_STATUS_USER_ENOUGH;
             }
             // （报名审核未通过或者已经取消报名的）可再次报名-我要报名