From 33949befa4c3e9e65cf6876fc78bc24983d56d25 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Mon, 4 Sep 2023 15:29:06 +0800
Subject: [PATCH] * Fix bug #38164.

---
 module/group/control.php | 8 +++-----
 module/group/model.php   | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/group/control.php b/module/group/control.php
index 79a570e0ed..c1d7da63ca 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -263,10 +263,7 @@ class group extends control
                     continue;
                 }
 
-                if(!$this->config->inQuickon && in_array("{$priv->module}-{$priv->method}", $this->config->group->hiddenPriv))
-                {
-                    continue;
-                }
+                if(!$this->config->inQuickon && in_array("{$priv->module}-{$priv->method}", $this->config->group->hiddenPriv)) continue;
 
                 if(!isset($privList[$priv->parentCode])) $privList[$priv->parentCode] = array();
                 if(!is_array($privList[$priv->parentCode])) $privList[$priv->parentCode] = array();
@@ -302,6 +299,7 @@ class group extends control
                     foreach($this->lang->resource->{$module} as $method => $methodLabel)
                     {
                         if(isset($privMethods[$module][$method])) continue;
+                        if(!$this->config->inQuickon && in_array("{$module}-{$method}", $this->config->group->hiddenPriv)) continue;
                         $privMethods[$module][$method] = $method;
 
                         $privList[$module][0]["{$module}-$method"] = new stdclass();
@@ -1035,7 +1033,7 @@ class group extends control
             $privList = $this->group->getPrivByParent(trim($parentList, ','));
             foreach($privList as $privID => $priv)
             {
-                $privList["{$priv->module}-{$priv->method}"] = $priv;
+                if($this->config->inQuickon || !in_array("{$priv->module}-{$priv->method}", $this->config->group->hiddenPriv)) $privList["{$priv->module}-{$priv->method}"] = $priv;
                 unset($privList[$privID]);
             }
         }
diff --git a/module/group/model.php b/module/group/model.php
index f130316b12..94cdb6e991 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -1646,6 +1646,7 @@ class groupModel extends model
             ->andWhere('t1.edition')->like("%,{$this->config->edition},%")
             ->andWhere('t1.vision')->like("%,{$this->config->vision},%")
             ->andWhere('t2.`objectType`')->eq('priv')
+            ->andWhere('t2.lang')->eq($this->app->getClientLang())
             ->orderBy('order_asc')
             ->fetchAll('id');
     }