Merge branch 'master' of http://47.118.43.255:3000/jjhc/jucai

app/Http/Controllers/Web/Recruit/IndexController.php

@@ -199,16 +199,16 @@ class IndexController extends WebBaseController
             }
             if($appoint_info){
                 //如果有报名记录，先查询首次报名是什么时候
-                $first_post = RecruitAppointLog::where('type',3)->where('uid',$uid)->orderBy('created_at','asc')->first();
+                $first_post = RecruitAppointLog::where('type',3)->where('uid',$uid)->where('appoint_id',$appoint_info->id)->orderBy('created_at','asc')->first();
                 if(!$first_post){//没有记录代表只是暂存
                     return $this->showMessage('抱歉，该招考已过报名时间或尚未开始！', route('recruit.show',array('id',$recruit['id'])), true, '上一页', '3');
                 }
-                $has_late_post = RecruitAppointLog::where('type',3)->where('uid',$uid)->where('created_at','>',$recruit['apply_end'])->first();//查找在过了报名时间后，有报名记录，且仍是审核失败的报名记录，看其是否在报名时间后是否有再次提交的记录
-                if($has_late_post){
-                    $formDisabled = 1;
-                }else{
-                    $formDisabled = 0;
-                }
+//                $has_late_post = RecruitAppointLog::where('type',3)->where('uid',$uid)->where('created_at','>',$recruit['apply_end'])->first();//查找在过了报名时间后，有报名记录，且仍是审核失败的报名记录，看其是否在报名时间后是否有再次提交的记录
+//                if($has_late_post){
+//                    $formDisabled = 1;
+//                }else{
+//                    $formDisabled = 0;
+//                }
             }
         }