From 73cccb2d61c49363957ddfa84b46e1f0bb4c050a Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 10 Mar 2023 09:05:13 +0000
Subject: [PATCH] * Finish task #86282.

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

diff --git a/module/group/control.php b/module/group/control.php
index 8f2285bed2..d2ca382754 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -740,6 +740,6 @@ class group extends control
      */
     public function ajaxUpdatePrivOrder()
     {
-        $this->group->updatePrivOrder();
+        if(!empty($_POST)) $this->group->updatePrivOrder();
     }
 }
diff --git a/module/group/js/editmanagepriv.js b/module/group/js/editmanagepriv.js
index 828a931e4e..a22fd1a2d9 100644
--- a/module/group/js/editmanagepriv.js
+++ b/module/group/js/editmanagepriv.js
@@ -91,19 +91,17 @@ $(function()
         finish: function(e)
         {
             var orders = {};
-            var arrGetItems = $('.sorter-group').data('zui.sortable').getItems();
+            var arrGetItems = $(e.target).parent().data('zui.sortable').getItems();
             for(var i = 0; i < arrGetItems.length; i++)
             {
                 var groupItem = arrGetItems[i];
                 var privID    = $(groupItem.item).find('input').data('id');
                 orders['orders[' + privID + ']'] = groupItem.order;
             }
-            //$packageBox.find('.group-item').each(function()
-            //{
-            //    orders['orders[' + privID + ']'] = $(this).data('order');
-            //});
+
             $.post(createLink('group', 'ajaxUpdatePrivOrder'), orders).error(function()
             {
+                bootbox.alert(lang.timeout);
             });
         }
     });
diff --git a/module/group/model.php b/module/group/model.php
index a6327f77ff..1d29d1cbc5 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -1484,7 +1484,6 @@ class groupModel extends model
     public function updatePrivOrder()
     {
         $data = fixer::input('post')->get();
-
-        foreach($data as $privID => $order) $this->dao->update(TABLE_PRIV)->set('order')->eq($order)->where('id')->eq($privID)->exec();
+        foreach($data->orders as $privID => $order) $this->dao->update(TABLE_PRIV)->set('order')->eq($order)->where('id')->eq($privID)->exec();
     }
 }