Merge branch 'master_xieqiyu_21382' into 'master'

* Fix bug#21382. See merge request easycorp/zentaopms!2944
2022-04-14 08:54:50 +00:00
parent 3cd615cdab 5468912f57
commit 4ddc0f62cd
1 changed files with 1 additions and 1 deletions
@@ -993,7 +993,6 @@ class userModel extends model
            /* Authorize by group. */
            foreach($groups as $group)
            {
-                $acl = json_decode($group->acl, true);
                if(empty($group->acl))
                {
                    $programAllow = true;
@@ -1005,6 +1004,7 @@ class userModel extends model
                    break;
                }

+                $acl = json_decode($group->acl, true);
                if(empty($acl['programs'])) $programAllow = true;
                if(empty($acl['projects'])) $projectAllow = true;
                if(empty($acl['products'])) $productAllow = true;