From a2efaabee055abecdbd92a6cd005eb3cb5747776 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 23 May 2024 14:44:21 +0800
Subject: [PATCH] * Add type param for update doc catalog order.

---
 module/api/js/common.ui.js                 | 1 +
 module/doc/control.php                     | 2 +-
 module/doc/js/common.ui.js                 | 1 +
 module/doc/model.php                       | 5 +++--
 module/doc/test/lib/doc.unittest.class.php | 5 +++--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/module/api/js/common.ui.js b/module/api/js/common.ui.js
index 7ec4344f35..9f0580e14a 100644
--- a/module/api/js/common.ui.js
+++ b/module/api/js/common.ui.js
@@ -385,6 +385,7 @@ window.updateOrder = function(event, orders)
 {
     let sortedIdList = {};
     for(let i in orders) sortedIdList['orders[' + orders[i] + ']'] = i;
+    sortedIdList['type'] = 'api';
 
     $.post($.createLink('doc', 'sortCatalog'), sortedIdList);
 }
diff --git a/module/doc/control.php b/module/doc/control.php
index 65afe0aa31..4995c68b43 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -1009,7 +1009,7 @@ class doc extends control
     {
         if($_POST)
         {
-            foreach($_POST['orders'] as $id => $order) $this->doc->updateOrder($id, (int)$order);
+            foreach($_POST['orders'] as $id => $order) $this->doc->updateOrder($id, (int)$order, $_POST['type']);
 
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             return $this->send(array('result' => 'success'));
diff --git a/module/doc/js/common.ui.js b/module/doc/js/common.ui.js
index 92e795cce8..1d51386567 100644
--- a/module/doc/js/common.ui.js
+++ b/module/doc/js/common.ui.js
@@ -241,6 +241,7 @@ window.updateOrder = function(event, orders)
 {
     let sortedIdList = {};
     for(let i in orders) sortedIdList['orders[' + orders[i] + ']'] = i;
+    sortedIdList['type'] = 'doc';
 
     $.post($.createLink('doc', 'sortCatalog'), sortedIdList);
 }
diff --git a/module/doc/model.php b/module/doc/model.php
index a3b6961110..8a0ed94b3c 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -2797,12 +2797,13 @@ class docModel extends model
      *
      * @param  int    $catalogID
      * @param  int    $order
+     * @param  string $order
      * @access public
      * @return bool
      */
-    public function updateOrder(int $catalogID, int $order): bool
+    public function updateOrder(int $catalogID, int $order, string $type = 'doc'): bool
     {
-        $this->dao->update(TABLE_MODULE)->set('`order`')->eq($order)->where('id')->eq($catalogID)->andWhere('type')->eq('doc')->exec();
+        $this->dao->update(TABLE_MODULE)->set('`order`')->eq($order)->where('id')->eq($catalogID)->andWhere('type')->eq($type)->exec();
 
         return !dao::isError();
     }
diff --git a/module/doc/test/lib/doc.unittest.class.php b/module/doc/test/lib/doc.unittest.class.php
index 0a864cbce2..c9036fce65 100644
--- a/module/doc/test/lib/doc.unittest.class.php
+++ b/module/doc/test/lib/doc.unittest.class.php
@@ -1419,12 +1419,13 @@ class docTest
      *
      * @param  int       $catalogID
      * @param  int       $order
+     * @param  string    $type  api|doc
      * @access public
      * @return int|false
      */
-    public function updateOrderTest(int $catalogID, int $order): int|false
+    public function updateOrderTest(int $catalogID, int $order, string $type = 'doc'): int|false
     {
-        $this->objectModel->updateOrder($catalogID, $order);
+        $this->objectModel->updateOrder($catalogID, $order, $type);
 
         if(dao::isError()) return dao::getError();
         return $this->objectModel->dao->select('`order`')->from(TABLE_MODULE)->where('id')->eq($catalogID)->fetch('order');