ad

app/admin/controller/Base.php

@@ -99,7 +99,7 @@ class Base extends \app\BaseController
         if($uid['roleid']==1){
             $action['write']=[];
         }
-
+        $action['roleid']=$uid['roleid'];
         $action['action_conllect']=implode(",",array_unique(explode(",",$action['action_conllect'])));
         return $action;
     }

app/admin/controller/Proorder.php

@@ -45,7 +45,7 @@ public function waitlist(){
     $where = [['is_del',"=",0],['a.status',"=",1]];
     $role=$this->checkRole();
     if(!empty($role['write'])){
-        $where[]=["wait_id","in",$role['write']];
+        $where[]=["roleid","=",$role['roleid']];
     }
     $order_code= isset($this->post['order_code']) && $this->post['order_code'] !==""? intval($this->post['order_code']):"";
     if($order_code!=""){

app/admin/model/Workflow.php

@@ -89,6 +89,7 @@ class Workflow extends \think\Model
                     "order_status"=>$data['action_process'],
                     "wait_id"=>$orderp['uid'],
                     "wait_name"=>$orderp['uname'],
+                    "roleid"=>$orderp['roleid'],
                     "action_uid"=>$data['action_uid'],
                     "action_name"=>$data['action_name'],
                     "status"=>$order_status,