合并分支 'master-server' 到 'master'

gx复制项目脚本



查看合并请求 !1329

@@ -119,7 +119,7 @@ class ProjectMenuSeoController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/8/3 14:19
      * @time   :2023/8/3 14:19
      */
      */
-    public function getSonMenu(ProjectMenuSeoLogic $projectMenuSeoLogic){
+    public function getMenu(ProjectMenuSeoLogic $projectMenuSeoLogic){
         $list = $projectMenuSeoLogic->roleMenuInfo();
         $list = $projectMenuSeoLogic->roleMenuInfo();
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }

@@ -94,15 +94,30 @@ class ProjectMenuSeoLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :当前菜单下的所有权限子菜单
+     * @remark :保存时获取菜单
      * @name   :roleMenuInfo
      * @name   :roleMenuInfo
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/8/2 16:24
      * @time   :2023/8/2 16:24
      */
      */
-    public function roleMenuInfo(){
-        $list = $this->model->list(['pid'=>$this->param['id']]);
-        return $this->success($list);
+    public function roleMenuInfo($id = 0){
+        if(empty($id)){
+            $lists = $this->model->list([],'sort');
+        }else{
+            //排除掉自己+自己的下级
+            $lists = $this->model->list(['id'=>['!=',$id],'pid'=>['!=',$id]],'sort');
+        }
+        $menu = array();
+        if(!empty($lists)){
+            foreach ($lists as $k => $v){
+                $v = (array)$v;
+                if ($v['pid'] == 0) {
+                    $v['sub'] = _get_child($v['id'], $lists);
+                    $menu[]   = $v;
+                }
+            }
+        }
+        return $this->success($menu);
     }
     }
 
 
     /**
     /**

@@ -57,7 +57,7 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/add', [Aside\User\ProjectMenuSeoController::class, 'add'])->name('admin.user_menu_add');
             Route::any('/add', [Aside\User\ProjectMenuSeoController::class, 'add'])->name('admin.user_menu_add');
             Route::any('/edit', [Aside\User\ProjectMenuSeoController::class, 'edit'])->name('admin.user_menu_edit');
             Route::any('/edit', [Aside\User\ProjectMenuSeoController::class, 'edit'])->name('admin.user_menu_edit');
             Route::any('/del', [Aside\User\ProjectMenuSeoController::class, 'del'])->name('admin.user_menu_del');
             Route::any('/del', [Aside\User\ProjectMenuSeoController::class, 'del'])->name('admin.user_menu_del');
-            Route::any('/getSonMenu', [Aside\User\ProjectMenuSeoController::class, 'getSonMenu'])->name('admin.user_menu_getSonMenu');
+            Route::any('/getMenu', [Aside\User\ProjectMenuSeoController::class, 'getMenu'])->name('admin.user_menu_getSonMenu');
             Route::any('/sort', [Aside\User\ProjectMenuSeoController::class, 'sort'])->name('admin.user_menu_sort');
             Route::any('/sort', [Aside\User\ProjectMenuSeoController::class, 'sort'])->name('admin.user_menu_sort');
         });
         });
         //用户组
         //用户组