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

* Fix module orderBy.

Browse Source
This commit is contained in:
Yagami
2018-11-12 15:52:20 +08:00
parent dd052ef32c
commit 9a2a2b234d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/model.php
+2 -2
View File
@@ -226,7 +226,7 @@ class treeModel extends model
$modules = $this->dao->select('*')->from(TABLE_MODULE)->where("((root = '" . (int)$rootID . "' and type = 'task' and parent != 0) OR (root = $id and type = 'story'))")
->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
->andWhere('deleted')->eq(0)
->orderBy('grade desc, branch, type, `order`')
->orderBy('grade desc, type, `order`')
->fetchAll('id');
}
else
@@ -234,7 +234,7 @@ class treeModel extends model
$modules = $this->dao->select('*')->from(TABLE_MODULE)->where("root = '" . (int)$rootID . "' and type = 'task' and path like '%,$id,%'")
->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
->andWhere('deleted')->eq(0)
->orderBy('grade desc, type, `order`')
->orderBy('grade desc, branch, type, `order`')
->fetchAll('id');
}