From ecc9176aff800aa811c9d05d4c685e2a54aef002 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 20 Apr 2023 13:24:44 +0800
Subject: [PATCH] * Fix bug #34468.

---
 module/group/js/managepriv.js            | 1 +
 module/group/model.php                   | 4 +++-
 module/group/view/privbypackage.html.php | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/group/js/managepriv.js b/module/group/js/managepriv.js
index 1b5359781d..69558d18ff 100644
--- a/module/group/js/managepriv.js
+++ b/module/group/js/managepriv.js
@@ -42,6 +42,7 @@ function setNoChecked()
     {
         if(!$(this).prop('checked') && $(this).attr('data-id') != undefined) noCheckValue = noCheckValue + ',' + $(this).attr('data-id');
     });
+  debugger
     $('#noChecked').val(noCheckValue);
 }
 
diff --git a/module/group/model.php b/module/group/model.php
index 856696965e..49015d4bed 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -2276,7 +2276,9 @@ class groupModel extends model
      */
     public function getPrivsIdListByGroup($groupID)
     {
-        $actions    = $this->dao->select("CONCAT(module, '-',  method) AS action")->from(TABLE_GROUPPRIV)->where('`group`')->eq($groupID)->fetchPairs();
+        $modulePairs = $this->getPrivManagerPairs('module');
+        $modules     = array_keys($modulePairs);
+        $actions    = $this->dao->select("CONCAT(module, '-',  method) AS action")->from(TABLE_GROUPPRIV)->where('`group`')->eq($groupID)->andWhere('module')->in($modules)->fetchPairs();
         $actions    = implode("','", $actions);
         $privIdList = $this->dao->select("*")->from(TABLE_PRIV)->where("CONCAT(module, '-',  method) IN ('$actions')")->fetchAll('id');
         return $privIdList;
diff --git a/module/group/view/privbypackage.html.php b/module/group/view/privbypackage.html.php
index 529aa768f5..589bb65416 100644
--- a/module/group/view/privbypackage.html.php
+++ b/module/group/view/privbypackage.html.php
@@ -198,8 +198,9 @@
         <label class='text-right' for='allChecker'><?php echo $lang->selectAll;?></label>
       </div>
       <?php echo html::hidden('actions[][]');?>
-      <?php echo html::submitButton($lang->save, '', 'btn btn-primary btn-wide');?>
+      <?php echo html::submitButton($lang->save, "onclick='setNoChecked()'", 'btn btn-primary btn-wide');?>
       <?php echo html::a($this->createLink('group', 'browse'), $lang->cancel, '', 'class="btn btn-wide"');?>
+      <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
     </div>
   </div>
 </form>