update

@@ -27,7 +27,7 @@ class DeptController extends BaseController
         $sort = ['id' => 'desc'];
         $sort = ['id' => 'desc'];
         $data = $logic->getList($map, $sort, ['id', 'pid', 'title'],0);
         $data = $logic->getList($map, $sort, ['id', 'pid', 'title'],0);
 
 
-        return view("admin.dept", ["list" => Arr::listToTree($data)]);
+        return $this->success(Arr::listToTree($data));
     }
     }
 
 
     public function info(Request $request, DeptLogic $logic){
     public function info(Request $request, DeptLogic $logic){

@@ -22,7 +22,7 @@ class GroupController extends BaseController
     public function list(Request $request, GroupLogic $logic)
     public function list(Request $request, GroupLogic $logic)
     {
     {
         $list = $logic->getList();
         $list = $logic->getList();
-        return view("admin.group", ["list" => $list]);
+        return $this->success($list);
     }
     }
 
 
     public function info(Request $request, GroupLogic $logic){
     public function info(Request $request, GroupLogic $logic){

@@ -22,7 +22,7 @@ class ManageController extends BaseController
     public function list(Request $request, ManageLogic $logic)
     public function list(Request $request, ManageLogic $logic)
     {
     {
         $list = $logic->getList();
         $list = $logic->getList();
-        return view("admin.manage", ["list" => $list]);
+        return $this->success($list);
     }
     }
 
 
     public function info(Request $request, ManageLogic $logic){
     public function info(Request $request, ManageLogic $logic){

@@ -24,7 +24,7 @@ class MenuController extends BaseController
         $map = [];
         $map = [];
         $sort = ['id' => 'desc'];
         $sort = ['id' => 'desc'];
         $list = $logic->getList($map, $sort, ['*'],0);
         $list = $logic->getList($map, $sort, ['*'],0);
-        return view("admin.menu", ["list" => Arr::listToTree($list)]);
+        return $this->success(Arr::listToTree($list));
     }
     }
 
 
     public function info(Request $request, MenuLogic $logic){
     public function info(Request $request, MenuLogic $logic){

@@ -30,7 +30,7 @@ class ProjectController extends BaseController
         $sort = ['id' => 'desc'];
         $sort = ['id' => 'desc'];
         $data = $logic->getList($map, $sort);
         $data = $logic->getList($map, $sort);
 
 
-        return view("admin.project", ["list" => $data]);
+        return $this->success($data);
     }
     }
 
 
     public function info(Request $request, ProjectLogic $logic){
     public function info(Request $request, ProjectLogic $logic){

@@ -31,7 +31,7 @@ class TaskController extends BaseController
         $sort = ['id' => 'desc'];
         $sort = ['id' => 'desc'];
         $data = $logic->getList($map, $sort);
         $data = $logic->getList($map, $sort);
 
 
-        return view("admin.task", ["list" => $data]);
+        return $this->success($data);
     }
     }
 
 
     public function info(Request $request, TaskLogic $logic){
     public function info(Request $request, TaskLogic $logic){

@@ -80,9 +80,6 @@ class Logic
         }else{
         }else{
             $result = $query->with($this->with)->select($columns)->get();
             $result = $query->with($this->with)->select($columns)->get();
         }
         }
-        if($this->side == Common::A){
-            return $result;
-        }
         return $this->success($result ? $result->toArray() : []);
         return $this->success($result ? $result->toArray() : []);
     }
     }
 
 

@@ -9,10 +9,10 @@ class Manage extends Base
     //设置关联表名
     //设置关联表名
     protected $table = 'gl_manage';
     protected $table = 'gl_manage';
 
 
-    protected $hidden = ['password'];
+    protected $hidden = ['password', 'token'];
 
 
-    const STATUS_ACTIVE = 0;
-    const STATUS_DISABLE = 1;
+    const STATUS_ACTIVE = 1;
+    const STATUS_DISABLE = 0;
 
 
     /**
     /**
      * 超级管理员ID, 当前ID拥有所有权限， 不能进行修改
      * 超级管理员ID, 当前ID拥有所有权限， 不能进行修改