* fix bug for report.

This commit is contained in:
wangyidong
2017-10-24 17:21:39 +08:00
parent 6c6c618337
commit 87d230dd2a
+5 -1
View File
@@ -1135,7 +1135,11 @@ class treeModel extends model
$branchs = $this->dao->select('id, name')->from(TABLE_BRANCH)->where('id')->in($branchIDList)->andWhere('deleted')->eq(0)->fetchALL('id');
foreach($modules as $module)
{
if(isset($modulePairs[$module->id])) $modulePairs[$module->id] = '/' . $branchs[$module->branch]->name . $modulePairs[$module->id];
if(isset($modulePairs[$module->id]))
{
$branchName = isset($branchs[$module->branch]) ? '/' . $branchs[$module->branch]->name : '';
$modulePairs[$module->id] = $branchName . $modulePairs[$module->id];
}
}
return $modulePairs;