gx

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

@@ -3,6 +3,7 @@
 namespace App\Http\Logic\Aside\Manage;
 namespace App\Http\Logic\Aside\Manage;
 
 
 
 
+use App\Helper\Arr;
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
@@ -59,6 +60,9 @@ class ManageLogic extends  BaseLogic
         if($managerInfo !== false){
         if($managerInfo !== false){
             $this->fail('当前手机号码已存在');
             $this->fail('当前手机号码已存在');
         }
         }
+        if (isset($this->param['rules']) && is_array($this->param['rules'])){
+            $this->param['rules'] = Arr::arrToSet($this->param['rules']);
+        }
         $this->param['password'] = Hash::make(isset($this->param['password']) ?? 'globalsov6');
         $this->param['password'] = Hash::make(isset($this->param['password']) ?? 'globalsov6');
         $this->model->add($this->param);
         $this->model->add($this->param);
         $this->success();
         $this->success();
@@ -93,6 +97,9 @@ class ManageLogic extends  BaseLogic
         if(isset($this->param['password']) && !empty($this->param['password'])){
         if(isset($this->param['password']) && !empty($this->param['password'])){
             $this->param['password'] = Hash::make($this->param['password']);
             $this->param['password'] = Hash::make($this->param['password']);
         }
         }
+        if (isset($this->param['rules']) && is_array($this->param['rules'])){
+            $this->param['rules'] = Arr::arrToSet($this->param['rules']);
+        }
         $this->model->edit($this->param,['id'=>$this->param['id']]);
         $this->model->edit($this->param,['id'=>$this->param['id']]);
     }
     }
 
 
@@ -120,7 +127,7 @@ class ManageLogic extends  BaseLogic
      */
      */
     public function getManagerInfo(){
     public function getManagerInfo(){
         $info = $this->model->read(['id'=>$this->param['id']],
         $info = $this->model->read(['id'=>$this->param['id']],
-            ['id','name','email','mobile','status','gid','sort','dept_id','is_dept_manager','created_at','role','updated_at']);
+            ['id','name','email','mobile','status','gid','sort','dept_id','is_dept_manager','created_at','role','rules','updated_at']);
         if($info === false){
         if($info === false){
             $this->fail('error');
             $this->fail('error');
         }
         }

@@ -93,6 +93,14 @@ class MenuLogic extends  BaseLogic
      */
      */
     public function getMenuByGroupId($gid){
     public function getMenuByGroupId($gid){
         $rights = Group::where(['id' => $gid, 'status' => Group::STATUS_NORMAL])->pluck('rights')->first();
         $rights = Group::where(['id' => $gid, 'status' => Group::STATUS_NORMAL])->pluck('rights')->first();
+        //获取个人权限
+        if(isset($this->manager['rules']) && !empty($this->manager['rules'])){
+            $rules = Arr::setToArr($this->manager['rules']);
+            // 合并两个数组
+            $mergedArray = array_merge($rules, $rights);
+            // 去除重复的元素
+            $rights = array_unique($mergedArray);
+        }
         $map = [
         $map = [
             'type'=>0,
             'type'=>0,
             'status' => Menu::STATUS_NORMAL,
             'status' => Menu::STATUS_NORMAL,