|
@@ -2698,7 +2698,7 @@ class Database
|
|
|
$level++;
|
|
|
|
|
|
foreach ($array as $k => $v) {
|
|
|
- if (isset($v[$key]) && $v[$key] == $parent_id) {
|
|
|
+ if ((isset($v[$key]) && $v[$key] == $parent_id) || (isset($v['parent_id']) && $v['parent_id'] == $parent_id)) {
|
|
|
$v['level'] = $level;
|
|
|
$v['name'] = $this->treeName($v['name'], $level);
|
|
|
$result[] = $v;
|