合并分支 'master-lyh-edit' 到 'master'

Master lyh edit



查看合并请求 !543

@@ -31,7 +31,6 @@ class TutorialController extends BaseController
      * @time   :2024/5/13 17:36
      * @time   :2024/5/13 17:36
      */
      */
     public function lists(Tutorial $tutorial){
     public function lists(Tutorial $tutorial){
-        $this->map['status'] = 0;
         $data = $tutorial->lists($this->map,$this->page,$this->row,$this->order);
         $data = $tutorial->lists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }

@@ -34,7 +34,7 @@ class TutorialController extends BaseController
         $lists = $tutorial->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $tutorial->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $v['download_url'] = url('b/file_manager_downLoad?path='.$v['path']);
+                $v['download_url'] = url('b/file_manager_downLoad?path='.$v['url']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }

@@ -33,7 +33,7 @@ class TutorialLogic extends BaseLogic
             $id = $this->param['id'];
             $id = $this->param['id'];
             $this->model->edit($this->param,['id'=>$id]);
             $this->model->edit($this->param,['id'=>$id]);
         }else{
         }else{
-            $this->model->addReturnId($this->param);
+            $id = $this->model->addReturnId($this->param);
         }
         }
         return $this->success(['id'=>$id]);
         return $this->success(['id'=>$id]);
     }
     }