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

@@ -21,7 +21,17 @@ class ManageController extends BaseController
 
     public function list(Request $request, ManageLogic $logic)
     {
-        $list = $logic->getList();
+        $map = [];
+        if(!empty($this->param['search'])){
+            $map[] = ['name|mobile', 'like', "%{$this->param['search']}%"];
+        }
+        if(!empty($this->param['dept_id'])){
+            $map[] = ['dept_id', $this->param['dept_id']];
+        }
+        if(!empty($this->param['gid'])){
+            $map[] = ['gid', $this->param['gid']];
+        }
+        $list = $logic->getList($map);
         return $this->success($list);
     }
 

@@ -18,11 +18,13 @@ use Illuminate\Http\Request;
  */
 class ProjectMenuController extends BaseController
 {
+
     /**
-     * @name :用户菜单列表
-     * @return json
-     * @author :liyuhang
-     * @method
+     * @remark :用户菜单列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:24
      */
     public function lists(){
         $menuModel = new ProjectMenuModel();
@@ -31,10 +33,24 @@ class ProjectMenuController extends BaseController
     }
 
     /**
-     * @name :详情
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @remark :添加菜单时获取菜单列表
+     * @name   :list
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:24
+     */
+    public function list(ProjectMenuLogic $projectMenuLogic){
+        $lists = $projectMenuLogic->MenuList();
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @param ProjectMenuLogic $projectMenuLogic
+     * @remark :详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:23
      */
     public function info(ProjectMenuLogic $projectMenuLogic){
         $this->request->validate([
@@ -47,10 +63,13 @@ class ProjectMenuController extends BaseController
     }
 
     /**
-     * @name :添加菜单
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param ProjectRoleRequest $request
+     * @param ProjectMenuLogic $projectMenuLogic
+     * @remark :添加菜单
+     * @name   :add
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:23
      */
     public function add(ProjectRoleRequest $request,ProjectMenuLogic $projectMenuLogic){
         $request->validated();
@@ -59,10 +78,13 @@ class ProjectMenuController extends BaseController
     }
 
     /**
-     * @name :编辑菜单
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param ProjectRoleRequest $request
+     * @param ProjectMenuLogic $projectMenuLogic
+     * @remark :编辑菜单
+     * @name   :edit
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:22
      */
     public function edit(ProjectRoleRequest $request,ProjectMenuLogic $projectMenuLogic){
         $request->validate([
@@ -75,10 +97,12 @@ class ProjectMenuController extends BaseController
     }
 
     /**
-     * @name :删除菜单
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param ProjectMenuLogic $projectMenuLogic
+     * @remark :删除菜单
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:22
      */
     public function del(ProjectMenuLogic $projectMenuLogic){
         $this->request->validate([

@@ -83,4 +83,24 @@ class ProjectMenuLogic extends BaseLogic
         }
         return $this->success();
     }
+
+    /**
+     * @remark :添加时获取菜单列表
+     * @name   :MenuList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:26
+     */
+    public function MenuList(){
+        $lists = $this->model->list(['status'=>$this->model::ZERO,'is_role'=>$this->model::ZERO]);
+        $menu = array();
+        foreach ($lists as $v){
+            $v = (array)$v;
+            if ($v['pid'] == 0) {
+                $v['sub'] = _get_child($v['id'], $lists);
+                $menu[]   = $v;
+            }
+        }
+        return $this->success($menu);
+    }
 }

@@ -10,4 +10,6 @@ class ProjectMenu extends Base
     protected $table = 'gl_project_menu';
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
+
+    const ZERO = 0;
 }

@@ -32,6 +32,7 @@ Route::middleware(['aloginauth'])->group(function () {
         //栏目管理
         Route::prefix('menu')->group(function () {
             Route::any('/', [Aside\User\ProjectMenuController::class, 'lists'])->name('admin.menu_lists');
+            Route::any('/list', [Aside\User\ProjectMenuController::class, 'list'])->name('admin.menu_list');
             Route::any('/info', [Aside\User\ProjectMenuController::class, 'info'])->name('admin.menu_info');
             Route::any('/add', [Aside\User\ProjectMenuController::class, 'add'])->name('admin.menu_add');
             Route::any('/edit', [Aside\User\ProjectMenuController::class, 'edit'])->name('admin.menu_edit');
@@ -190,8 +191,8 @@ Route::middleware(['aloginauth'])->group(function () {
 //无需登录验证的路由组
 Route::group([], function () {
     Route::any('/login', [Aside\LoginController::class, 'login'])->name('admin.login.white');
-    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('image_show');
-    Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('file_show');
+    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('admin.image_show');
+    Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('admin.file_show');
 });