From 5430e33eb6eee0f74584347362515a74fc0e74aa Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@chandao.com>
Date: Tue, 6 Jan 2026 10:46:47 +0000
Subject: [PATCH 1/3]  * Add 22.0 to upgrade config.

---
 module/upgrade/config.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index 6ee02137f5..979b7f8933 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -340,7 +340,8 @@ $config->upgrade->ipdVersion['ipd4_3']         = '21_7_4';
 $config->upgrade->ipdVersion['ipd4_4']         = '21_7_5';
 $config->upgrade->ipdVersion['ipd4_5']         = '21_7_6';
 $config->upgrade->ipdVersion['ipd4_6']         = '21_7_7';
-$config->upgrade->ipdVersion['ipd4_7']         = '21_7_8'; // ipd insert position.
+$config->upgrade->ipdVersion['ipd4_7']         = '21_7_8';
+$config->upgrade->ipdVersion['ipd5_0']         = '22_0'; // ipd insert position.
 
 $config->upgrade->lowerTables = array();
 $config->upgrade->lowerTables[$config->db->prefix . 'caseStep']       = $config->db->prefix . 'casestep';

From be431ca7196bd9a0265b218c30080db19c6ec316 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@chandao.com>
Date: Tue, 6 Jan 2026 10:56:00 +0000
Subject: [PATCH 2/3]  * Fix code error.

---
 module/common/tao.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/common/tao.php b/module/common/tao.php
index cb132a84fb..808489b766 100644
--- a/module/common/tao.php
+++ b/module/common/tao.php
@@ -37,8 +37,9 @@ class commonTao extends commonModel
         $select  = '';
         if($this->session->$typeOnlyCondition)
         {
-            if($orderBy and str_contains($orderBy, 'priOrder'))      $select .= ", IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder";
-            if($orderBy and str_contains($orderBy, 'severityOrder')) $select .= ", IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder";
+            if($orderBy and str_contains($orderBy, 'priOrder'))          $select .= ", IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder";
+            if($orderBy and str_contains($orderBy, 'severityOrder'))     $select .= ", IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder";
+            if($type == 'task' && str_contains($orderBy, 'statusOrder')) $select .= ", INSTR('wait,doing,done,pause,cancel,closed,', status) as statusOrder";
             $queryCondition = str_replace('t4.status', 'status', $queryCondition);
 
             $sql = $this->dao->select("*$select")->from($table)

From bb19fa1f0a818c7ce7254c1a8cd80ec513503695 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@chandao.com>
Date: Tue, 6 Jan 2026 11:05:19 +0000
Subject: [PATCH 3/3]  * Fix code error.

---
 module/transfer/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/transfer/model.php b/module/transfer/model.php
index 62335c38a2..67f789e540 100644
--- a/module/transfer/model.php
+++ b/module/transfer/model.php
@@ -699,6 +699,7 @@ class transferModel extends model
             $selectedFields = '*';
             if($orderBy && strpos($orderBy, 'priOrder') !== false)      $selectedFields .= ",IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) AS priOrder";
             if($orderBy && strpos($orderBy, 'severityOrder') !== false) $selectedFields .= ",IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) AS severityOrder";
+            if($module == 'task' && $orderBy && strpos($orderBy, 'statusOrder') !== false) $selectedFields .= ",INSTR('wait,doing,done,pause,cancel,closed,', status) AS statusOrder";
 
             $table = zget($this->config->objectTables, $module); //获取对应的表
             $moduleDatas = $this->dao->select($selectedFields)->from($table)