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

gx



查看合并请求 !544

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

@@ -70,6 +70,9 @@ class CustomTemplateLogic extends BaseLogic
             $six_read = $this->param['six_read'] ?? 0;//5.0数据时，是否按6.0显示
             if($is_upgrade == 0 || $six_read == 1) {
                 $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
+                if($this->param['url'] == 'news' || $this->param['url'] == 'product' || $this->param['url'] == 'blog'){
+                    $this->fail('不允许创建'.$this->param['news']);
+                }
             }
             $this->editCustomRoute($this->param['url']);
             $rs = $this->model->edit($this->param,['id'=>$id]);