gx

@@ -65,14 +65,22 @@ class TaskController extends BaseController
     public function searchParam(&$task,&$taskOwnerModel){
     public function searchParam(&$task,&$taskOwnerModel){
         $map = [];
         $map = [];
         if(isset($this->map['type']) && !empty($this->map['type'])){
         if(isset($this->map['type']) && !empty($this->map['type'])){
-            if($this->map['type'] == 1){
-                $ids = $task->where('created_manage_id', $this->map['manage_id'])->pluck('id')->toArray();
-                $manage_ids = $taskOwnerModel->formatQuery(['task_id'=>['in',$ids]])->pluck('manage_id')->toArray();
-                $map['manage_id'] = ['in',$manage_ids];
-            }else{
-                $map['manage_id'] = $this->map['manage_id'];
+            if(isset($this->map['manage_id']) && !empty($this->map['manage_id'])){
+                if($this->map['type'] == 1){
+                    $ids = $task->where('created_manage_id', $this->map['manage_id'])->pluck('id')->toArray();
+                    $manage_ids = $taskOwnerModel->formatQuery(['task_id'=>['in',$ids]])->pluck('manage_id')->toArray();
+                    $map['manage_id'] = ['in',$manage_ids];
+                }else{
+                    $map['manage_id'] = $this->map['manage_id'];
+                }
             }
             }
         }
         }
+        if(isset($this->map['manage_id']) && !empty($this->map['manage_id'])){
+            $map['manage_id'] = $this->map['manage_id'];
+        }
+        if(isset($this->map['content']) && !empty($this->map['content'])){
+
+        }
         return $map;
         return $map;
     }
     }
 
 

@@ -186,6 +186,8 @@ class LoginController extends BaseController
             $resMessage = $data['message'];
             $resMessage = $data['message'];
         }elseif($data['code'] == 1){
         }elseif($data['code'] == 1){
             $resMessage = $data['message'];
             $resMessage = $data['message'];
+        }elseif($data['code'] == 2){
+            $resMessage = $data['message'];
         }else{
         }else{
             $resMessage = $data['message'];
             $resMessage = $data['message'];
         }
         }
@@ -254,8 +256,13 @@ class LoginController extends BaseController
         $key = explode("_",$eventKey);
         $key = explode("_",$eventKey);
         if($key[1] == 'login'){
         if($key[1] == 'login'){
             $data = $userLoginLogic->wechatLogin($wechat);
             $data = $userLoginLogic->wechatLogin($wechat);
-        }else{
+        }elseif($key[1] == 'bind'){
             $data = $userLoginLogic->wechatBind($wechat,$key[2]);
             $data = $userLoginLogic->wechatBind($wechat,$key[2]);
+        }else{
+            $data = [
+                'code'=>0,
+                'message'=>'关注后，再次扫码',
+            ];
         }
         }
         return $data;
         return $data;
     }
     }