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

2021-09-08 16:33:36 +08:00
parent 47b838ddb5 4ba2c2d7f8
commit e9002f78c2
105 changed files with 1303 additions and 418 deletions
@@ -781,6 +781,7 @@ class actionModel extends model
        $docs = $this->doc->getPrivDocs(array_keys($libs), 0, 'all');

        $actionCondition = $this->getActionCondition();
+        if(!$actionCondition and isset($this->app->user->rights['acls']['actions'])) return array();

        /* Get actions. */
        $actions = $this->dao->select('*')->from(TABLE_ACTION)
@@ -827,6 +828,7 @@ class actionModel extends model
        if(isset($this->app->user->rights['acls']['actions']))
        {
            if(empty($this->app->user->rights['acls']['actions'])) return '';
+
            foreach($this->app->user->rights['acls']['actions'] as $moduleName => $actions)
            {
                $actionCondition .= "(`objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";