Merge remote-tracking branch 'origin/master' into akun

@@ -473,12 +473,14 @@ class ProjectController extends BaseController
     }
     }
 
 
     /**
     /**
-     * 提交审核
-     * @author zbj
-     * @date 2023/6/29
+     * @remark :提交审核
+     * @name   :submit_check
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/2 9:59
      */
      */
-    public function submit_check(Request $request, OnlineCheckLogic $logic){
-        $request->validate([
+    public function submit_check(OnlineCheckLogic $logic){
+        $this->request->validate([
             'id'=>'required'
             'id'=>'required'
         ],[
         ],[
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
@@ -628,7 +630,6 @@ class ProjectController extends BaseController
         if(!$source_id && !$id){
         if(!$source_id && !$id){
             $this->response('参数异常',Code::SYSTEM_ERROR);
             $this->response('参数异常',Code::SYSTEM_ERROR);
         }
         }
-
         $channel_id = 0;
         $channel_id = 0;
         if($source_id){
         if($source_id){
             $channel = Channel::where('source_id', $source_id)->first();
             $channel = Channel::where('source_id', $source_id)->first();

@@ -43,7 +43,7 @@ class OnlineCheckLogic extends BaseLogic
             if($info['optimist_status'] != 1){
             if($info['optimist_status'] != 1){
                 $this->fail('请先优化师审核');
                 $this->fail('请先优化师审核');
             }
             }
-            if($info['qa_mid'] != $this->manager['id']){
+            if($info['qa_mid'] != 0 && $info['qa_mid'] != $this->manager['id']){
                 $this->fail('你无权限提交审核');
                 $this->fail('你无权限提交审核');
             }
             }
             if(isset($this->param['project_type']) && !empty($this->param['project_type'])){
             if(isset($this->param['project_type']) && !empty($this->param['project_type'])){
@@ -74,7 +74,7 @@ class OnlineCheckLogic extends BaseLogic
         }else{
         }else{
             $projectModel = new Project();
             $projectModel = new Project();
             //提交审核修改状态为审核中
             //提交审核修改状态为审核中
-            $projectModel->edit(['status'=>$projectModel::STATUS_ONE],['id'=>$this->param['id']]);
+            $projectModel->edit(['status'=>1],['id'=>$this->param['id']]);
             //组装数据
             //组装数据
             $data = [
             $data = [
                 'project_id' => $this->param['id'],
                 'project_id' => $this->param['id'],

@@ -374,7 +374,7 @@ class BTemplateLogic extends BaseLogic
                 $newsInfo = $newsModel->read(['id'=>$source_id],['url']);
                 $newsInfo = $newsModel->read(['id'=>$source_id],['url']);
                 $route = $newsInfo['url'];
                 $route = $newsInfo['url'];
             }else{
             }else{
-                $type = 0;
+                $type = 'all';
                 $route = 'all';
                 $route = 'all';
             }
             }
         }
         }