Merge branch 'sprint/221_liumengyi_25964' into 'master'

* Fix bug #25964. See merge request easycorp/zentaopms!4757
2022-08-03 05:43:20 +00:00
parent 9ec11b0fd8 fc60a3f503
commit b7e845f6b5
1 changed files with 1 additions and 1 deletions
@@ -100,7 +100,7 @@ class executionModel extends model
            include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
        }

-        if($execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist);
+        if(isset($execution->cal) and $execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist);

        if($execution and $execution->lifetime == 'ops')
        {