Merge branch 'zx_saas_director_0927' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/student/controller/TempDirectorTrainingCampController.java

@@ -40,7 +40,7 @@ public class TempDirectorTrainingCampController extends BaseController {
     public HttpResponseResult<TempDirectorTrainingCamp> getDetail(Integer campId){
         return succeed(tempDirectorTrainingCampService.lambdaQuery()
                 .eq(TempDirectorTrainingCamp::getId,campId)
-                .eq(TempDirectorTrainingCamp::getDelFlag,true)
+                .eq(TempDirectorTrainingCamp::getDelFlag,false)
                 .last("LIMIT 1").one());
     }
 

mec-application/src/main/java/com/ym/mec/web/controller/TempDirectorTrainingCampDetailController.java

@@ -64,7 +64,7 @@ public class TempDirectorTrainingCampDetailController extends BaseController {
         }
         TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.lambdaQuery()
                 .eq(TempDirectorTrainingCamp::getId, queryInfo.getTempDirectorTrainingCampId())
-                .eq(TempDirectorTrainingCamp::getDelFlag, true)
+                .eq(TempDirectorTrainingCamp::getDelFlag, false)
                 .last("LIMIT 1").one();
         if (trainingCamp==null) {
             throw new BizException("训练营不存在");

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempDirectorTrainingCampDetailServiceImpl.java

@@ -90,7 +90,7 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
         Date now = new Date();
         TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.lambdaQuery()
                 .eq(TempDirectorTrainingCamp::getId,applyCamp.getTempDirectorTrainingCampId())
-                .eq(TempDirectorTrainingCamp::getDelFlag,true)
+                .eq(TempDirectorTrainingCamp::getDelFlag,false)
                 .last("LIMIT 1").one();
         this.checkTraining(now,trainingCamp);
         if(!smsCodeService.verifyValidCode(applyCamp.getMobile(), applyCamp.getAuthCode())){
@@ -212,7 +212,7 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
         Date now = new Date();
         TempDirectorTrainingCamp trainingCamp = tempDirectorTrainingCampService.lambdaQuery()
                 .eq(TempDirectorTrainingCamp::getId,campDetail.getTempDirectorTrainingCampId())
-                .eq(TempDirectorTrainingCamp::getDelFlag,true)
+                .eq(TempDirectorTrainingCamp::getDelFlag,false)
                 .last("LIMIT 1").one();
         this.checkTraining(now,trainingCamp);
         List<StudentPaymentOrder> studentPaymentOrders = studentPaymentOrderService.queryByCondition(GroupType.SPORADIC,