修改搜索接口

@@ -232,25 +232,34 @@ class Index extends Api
             }
             }
         }
         }
 
 
+        $where['user_id'] = $user_id;
+        $where['folder_id'] = 0;
+
+        $tiao['a.folder_id'] = 0;
+        $tiao['a.user_id'] = $user_id;
+
         //判断分类 1笔记2图片3视频
         //判断分类 1笔记2图片3视频
         $fenlei = $this->request->param('fenlei');
         $fenlei = $this->request->param('fenlei');
         if($fenlei == 1){
         if($fenlei == 1){
-            $where['type'] = 1;
-            $tiao['b.type'] = 1;
+            $note = $this->myfile(1,$where,$user_id);
+            $rotor = $this->zhuan(1,$tiao);
+            $arr = $this->gong(1,$note,$rotor);
+            $Info['note'] = $this->sundry($arr);
+            $this->success('success',$Info);
         }elseif ($fenlei == 2){
         }elseif ($fenlei == 2){
-            $where['type'] = 2;
-            $tiao['b.type'] = 2;
+            $pic = $this->myfile(2,$where,$user_id);
+            $rotor_pic = $this->zhuan(2,$tiao);
+            $arr_pic = $this->gong(2,$pic,$rotor_pic);
+            $Info['pic'] = $this->sundry($arr_pic);
+            $this->success('success',$Info);
         }elseif ($fenlei == 3){
         }elseif ($fenlei == 3){
-            $where['type'] = 3;
-            $tiao['b.type'] = 3;
+            $video = $this->myfile(3,$where,$user_id);
+            $rotor_video = $this->zhuan(3,$tiao);
+            $arr_video = $this->gong(3,$video,$rotor_video);
+            $Info['video'] = $this->sundry($arr_video);
+            $this->success('success',$Info);
         }
         }
 
 
-        $where['user_id'] = $user_id;
-        $where['folder_id'] = 0;
-
-        $tiao['a.folder_id'] = 0;
-        $tiao['a.user_id'] = $user_id;
-
         //自己的笔记文件
         //自己的笔记文件
         $note = $this->myfile(1,$where,$user_id);
         $note = $this->myfile(1,$where,$user_id);
         //自己的图片文件
         //自己的图片文件