查询权限优化

cloud-training-project-service/src/main/java/com/yizhi/training/application/service/impl/TrainingProjectServiceImpl.java

@@ -825,7 +825,7 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
                     introductionVo.setActivityStateName(TrEnrollStatusEnum.ACT_WAIT_ENROLL.getValue());
 
                     //根据报名开始时间和签到开始时间设置报名活动状态
-                    Date endTime = tr.getSignStartTime();
+                   /* Date endTime = tr.getSignStartTime();
                     if(endTime == null){
                         endTime = tr.getEnrollEndTime();
                     } else {
@@ -835,8 +835,8 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
                         if((endTime.after(s) || s.equals(endTime)) && (endTime.before(e) || e.equals(endTime))){
                             endTime = e;
                         }
-                    }
-                    state = compareTime(tr.getEnrollStartTime(), endTime);
+                    }*/
+                    state = compareTime(tr.getEnrollStartTime(), tr.getEnrollEndTime());
                     if (state == TrEnrollStatusEnum.ACT_RUN) {
                         introductionVo.setActivityStateCode(TrEnrollStatusEnum.ACT_ENROLL.getCode());
                         introductionVo.setActivityStateName(TrEnrollStatusEnum.ACT_ENROLL.getValue());