Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Aside;
 
 use App\Enums\Common\Code;
+use App\Enums\Common\Common;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -21,7 +22,7 @@ class BaseController extends Controller
     protected $order = 'id';
     protected $map = [];//处理后的参数
     protected $uid = 0;
-    protected $user = [];//当前登录用户详情
+    protected $manage = [];//当前登录用户详情
     /**
      * 获取所有参数
      */
@@ -31,9 +32,9 @@ class BaseController extends Controller
         $this->param = $this->request->all();
         $this->token = $this->request->header('token');
         $this->get_param();
-        if(!empty($this->token) && !empty(Cache::get($this->token))){
-            $info = Cache::get($this->token);
-            $this->user = $info;
+        if(!empty($this->token) && !empty(Cache::get(Common::MANAGE_TOKEN . $this->token))){
+            $info = Cache::get(Common::MANAGE_TOKEN . $this->token);
+            $this->manage = $info;
             $this->uid = $info['id'];
         }
     }

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Aside;
 
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
+use App\Http\Logic\Aside\Manage\MenuLogic;
+use App\Models\Manage\Manage;
 
 /**
  * Class IndexController
@@ -11,16 +11,25 @@ use Illuminate\Http\Request;
  * @author zbj
  * @date 2023/4/19
  */
-class IndexController extends Controller
+class IndexController extends BaseController
 {
     /**
-     * 首页
-     * @param Request $request
+     * 用户菜单
+     * @param MenuLogic $logic
      * @return \Illuminate\Http\JsonResponse
+     * @throws \Psr\Container\ContainerExceptionInterface
+     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @author zbj
+     * @date 2023/6/21
      */
-    public function index(Request $request)
+    public function get_menu(MenuLogic $logic)
     {
-
+        if($this->manage['id'] == Manage::ADMINISTRATOR_ID){ //超级管理员
+            $menus = $logic->getAllMenu();
+        }else{
+            $menus = $logic->getMenuByGroupId($this->manage['gid']);
+        }
+        return $this->success($menus);
     }
 
 }

@@ -26,7 +26,7 @@ class MenuController extends BaseController
     {
         $map = [];
         $sort = ['id' => 'desc'];
-        $list = $logic->getList($map, $sort, ['*'],0);
+        $list = $logic->getList($map, $sort, ['id', 'pid', 'title', 'icon', 'type'],0);
         return $this->success(Arr::listToTree($list));
     }
 

@@ -27,7 +27,7 @@ class LoginLogic extends BaseLogic
 
     public function login()
     {
-        $manage = $this->model->select('id', 'name', 'password', 'token', 'status')->where('mobile', $this->requestAll['mobile'])->first();
+        $manage = $this->model->select('id', 'name', 'password', 'token', 'status', 'gid', 'dept_id')->where('mobile', $this->requestAll['mobile'])->first();
         if (!$manage){
             $this->fail('登录用户名不存在');
         }

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Manage;
 
 use App\Helper\Arr;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Manage\Group;
 use App\Models\Manage\Menu;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
@@ -57,4 +58,20 @@ class MenuLogic extends  BaseLogic
         }
         return parent::delete($ids);
     }
+
+    public function getAllMenu(){
+        $map[] = ['type' => Menu::TYPE_MENU];
+        $map[] = ['status' => Menu::STATUS_NORMAL];
+        $list = parent::getList($map, ['id' => 'desc'], ['id', 'pid', 'title', 'icon', 'type'], 0);
+        return $this->success(Arr::listToTree($list));
+    }
+
+    public function getMenuByGroupId($gid){
+        $rights = Group::where(['id' => $gid, 'status' => Group::STATUS_NORMAL])->pluck('rights')->first();
+        $map[] = ['type' => Menu::TYPE_MENU];
+        $map[] = ['status' => Menu::STATUS_NORMAL];
+        $map[] = ['id', 'in', $rights];
+        $list = parent::getList($map, ['id' => 'desc'], ['id', 'pid', 'title', 'icon', 'type'], 0);
+        return $this->success(Arr::listToTree($list));
+    }
 }

@@ -8,6 +8,7 @@ use \App\Http\Controllers\Aside;
 //必须登录验证的路由组
 Route::middleware(['aloginauth'])->group(function () {
     Route::get('/', [Aside\IndexController::class, 'index'])->name('admin.home.white');
+    Route::get('/get_menu', [Aside\IndexController::class, 'get_menu'])->name('admin.get_menu.white');
     Route::get('/logout', [Aside\LoginController::class, 'logout'])->name('admin.logout.white');
     //会员相关
     Route::prefix('user')->group(function () {