gx

@@ -30,15 +30,16 @@ class ProjectMenuController extends BaseController
      */
      */
     public function lists(){
     public function lists(){
         $menuModel = new ProjectMenuModel();
         $menuModel = new ProjectMenuModel();
-        if(isset($this->param['pid'])){
-            $this->map['pid'] = $this->param['pid'];
-        }
-        //是否为权限菜单
-        if(isset($this->param['is_role'])){
-            $this->map['is_role'] = $this->param['is_role'];
+        $lists = $menuModel->lists($this->map,$this->page,$this->row,$this->order);
+        $menu = array();
+        foreach ($lists as $k => $v){
+            $v = (array)$v;
+            if ($v['pid'] == 0) {
+                $v['sub'] = _get_child($v['id'], $lists);
+                $menu[]   = $v;
+            }
         }
         }
-        $lists = $menuModel->lists($this->map,$this->page,$this->row,$this->order,['*']);
-        $this->response('success',Code::SUCCESS,$lists);
+        $this->response('success',Code::SUCCESS,$menu);
     }
     }
 
 
     /**
     /**

@@ -31,13 +31,8 @@ class ProjectRoleController extends BaseController
         $lists = $roleModel->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $roleModel->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                if($v['type'] == 1){
-                    $userModel = new UserModel();
-                    $lists['list'][$k]['operator_name'] = $userModel->read(['id'=>$v['operator_id']],['name'])['name'];
-                }else{
-                    $managerModel = new Manage();
-                    $lists['list'][$k]['operator_name'] = $managerModel->read(['id'=>$v['operator_id']],['name'])['name'];
-                }
+                $userModel = new UserModel();
+                $lists['list'][$k]['operator_name'] = $userModel->read(['id'=>$v['operator_id']],['name'])['name'];
                 $lists['list'][$k]['project_name'] = (new Project())->read(['id'=>$v['project_id']],['title'])['title'];
                 $lists['list'][$k]['project_name'] = (new Project())->read(['id'=>$v['project_id']],['title'])['title'];
             }
             }
         }
         }

@@ -31,18 +31,13 @@ class ProjectUserController extends BaseController
     public function lists(){
     public function lists(){
         $userModel = new UserModel();
         $userModel = new UserModel();
         $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order);
-//        if(!empty($lists)){
-//            foreach ($lists['list'] as $k => $v){
-//                if($v['type'] == $this::TYPE_ONE){
-//                    $userModel = new UserModel();
-//                    $lists['list'][$k]['operator_name'] = $userModel->read(['id'=>$v['operator_id']],['name'])['name'];
-//                }else{
-//                    $managerModel = new Manage();
-//                    $lists['list'][$k]['operator_name'] = $managerModel->read(['id'=>$v['operator_id']],['name'])['name'];
-//                }
-//                $lists['list'][$k]['project_name'] = (new Project())->read(['id'=>$v['project_id']],['title'])['title'];
-//            }
-//        }
+        if(!empty($lists)){
+            foreach ($lists['list'] as $k => $v){
+                $userModel = new UserModel();
+                $lists['list'][$k]['operator_name'] = $userModel->read(['id'=>$v['operator_id']],['name'])['name'];
+                $lists['list'][$k]['project_name'] = (new Project())->read(['id'=>$v['project_id']],['title'])['title'];
+            }
+        }
         $this->response('列表',Code::SUCCESS,$lists);
         $this->response('列表',Code::SUCCESS,$lists);
     }
     }