Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch release/22.0.alpha1 of zentao/zentaopms (#13156)

Browse Source
This commit is contained in:
刘刚
2026-01-07 09:42:33 +08:00
committed by Gitfox
parent c6010d8007 bb19fa1f0a
commit d5309cb1ac
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/tao.php
+3 -2
View File
@@ -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)
module/transfer/model.php
+1
View File
@@ -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)
module/upgrade/config.php
+2 -1
View File
@@ -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';