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

Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0

Browse Source
This commit is contained in:
hufangzhou
2021-06-07 12:26:32 +08:00
parent 0942d6a4f7 8d75769726
commit fedd2ddc87
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xuanxuan/module/tree/ext/model/xuanxuan.php
+3 -3
View File
@@ -2,14 +2,14 @@
public function getFamily($categoryID, $type = '', $root = 0)
{
if($categoryID == 0 and empty($type)) return array();
$category = $this->getById($categoryID);
$category = $this->loadModel('dept')->getById($categoryID);
if($category)
{
return $this->dao->select('id')->from(TABLE_MODULE)->where('deleted')->eq('0')->andWhere('path')->like($category->path . '%')->fetchPairs();
return $this->dao->select('id')->from(TABLE_DEPT)->where('path')->like($category->path . '%')->fetchPairs();
}
if(!$category)
{
return $this->dao->select('id')->from(TABLE_MODULE)->where('deleted')->eq('0')->andWhere('type')->eq($type)->beginIF($root)->andWhere('root')->eq((int)$root)->fi()->fetchPairs();
return $this->dao->select('id')->from(TABLE_DEPT)->beginIF($root)->where('root')->eq((int)$root)->fi()->fetchPairs();
}
}