Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

2021-08-10 16:50:14 +08:00
parent 1073b0cc36 3cac516fb3
commit df3de3ba71
23 changed files with 150 additions and 38 deletions
@@ -773,7 +773,7 @@ class programModel extends model
        $treeMenu = array();
        foreach($modules as $module)
        {
-            if(strpos($this->app->user->view->programs, (string)$module->id) === false) continue;
+            if(strpos($this->app->user->view->programs, (string)$module->id) === false and (!$this->app->user->admin)) continue;

            $moduleName    = '/';
            $parentModules = explode(',', $module->path);