作者 lyh

gx

@@ -29,11 +29,17 @@ class ComController extends BaseController @@ -29,11 +29,17 @@ class ComController extends BaseController
29 $projectRoleModel = new ProjectRoleModel(); 29 $projectRoleModel = new ProjectRoleModel();
30 $info = $projectRoleModel->read(['id'=>$this->user['role_id']]); 30 $info = $projectRoleModel->read(['id'=>$this->user['role_id']]);
31 $info['role_menu'] = trim($info['role_menu'],','); 31 $info['role_menu'] = trim($info['role_menu'],',');
32 - $lists = $projectMenuModel->where(['status'=>0,'is_role'=>0])->whereIn('id',explode(',',$info['role_menu']))->get(); 32 + $this->map = [
  33 + 'status'=>0,
  34 + 'is_role'=>0,
  35 + 'id'=>['in',explode(',',$info['role_menu'])]
  36 + ];
33 }else{ 37 }else{
34 - $lists = $projectMenuModel->where(['is_role'=>0])->get(); 38 + $this->map = [
  39 + 'status'=>0,
  40 + ];
35 } 41 }
36 - $lists = $lists->toArray(); 42 + $lists = $projectMenuModel->list($this->map);
37 $menu = array(); 43 $menu = array();
38 foreach ($lists as $k => $v){ 44 foreach ($lists as $k => $v){
39 $v = (array)$v; 45 $v = (array)$v;