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

Merge branch 'tanghucheng_feedback_module' into 'master'

Browse Source 
* Fix bug #28684.

See merge request easycorp/zentaopms!5811
This commit is contained in:
王怡栋
2022-10-19 08:55:39 +00:00
parent af6634eaad c0a9e98cd1
commit e3f2bce7ca
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/model.php
+6 -2
View File
@@ -84,7 +84,11 @@ class treeModel extends model
/* If feedback module is merge add story module.*/
$syncConfig = json_decode($this->config->global->syncProduct, true);
$syncConfig = isset($syncConfig[$type]) ? $syncConfig[$type] : array();
if(($type == 'feedback' or $type == 'ticket') and strpos($param, 'noproduct') === false and isset($syncConfig[$rootID])) $type = 'story,' . $type;
if(($type == 'feedback' or $type == 'ticket') and strpos($param, 'noproduct') === false and isset($syncConfig[$rootID]))
{
$grade = $syncConfig[$rootID];
$type = 'story,' . $type;
}
if($this->isMergeModule($rootID, $type))
{
return $this->dao->select('*')->from(TABLE_MODULE)
@@ -107,7 +111,7 @@ class treeModel extends model
->where('1=1')
->beginIF($type != 'feedback' or !empty($rootID))->andwhere('root')->eq((int)$rootID)->fi()
->andWhere('type')->in($type)
->beginIF($grade)->andWhere('grade')->lt($grade)->fi()
->beginIF($grade)->andWhere('grade')->le($grade)->fi()
->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
->beginIF($branch !== 'all' and $branch !== '' and $branch !== false)
->andWhere('(branch')->eq(0)