bug修改

@@ -226,6 +226,7 @@ class IndexController extends RestBaseController
         $userId=$this->getUserId();
         $activity = $activityModel->findData(array('id'=>$id));
         /*获取状态*/
+
         /*是否为志愿者*/
         $Volunteer=new VolunteerModel();
         $volunteerMap['user_id']=$userId;
@@ -259,18 +260,18 @@ class IndexController extends RestBaseController
         }else{
             $is_join=1;
         }
-        $is_pass=0;
         /*是否报名通过*/
         if (empty($join['status']) || $join['status']==2){
             $is_pass=0;
             $is_book=0;
         }elseif($join['status']=='3'){
             $is_book=1;
-        }elseif($join['status']=='2'){
+            $is_pass=1;
+        }elseif($join['status']=='1'){
             $is_book=0;
-            $is_pass=0;
+            $is_pass=1;
         }
-        $check=0;
+
         if ($is_volunteer==0 && $check==0) {
             $status=6;
             $check=1;