Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170'

* Fix the bugs. See merge request easycorp/zentaopms!447
2021-11-15 01:05:55 +00:00
parent 5ede27a2c6 e441e4a28d
commit 9e74d7204a
3 changed files with 3 additions and 2 deletions
@@ -857,7 +857,7 @@ class treeModel extends model
                if(is_array($extra))
                {
                    $table   = $this->config->objectTables[$type];
-                    $objects = $this->dao->select('module')->from($table)->where('product')->eq((int)$extra['rootID'])->andWhere('branch')->eq((int)$extra['branch'])->fetchAll('module');
+                    $objects = $this->dao->select('module')->from($table)->where('product')->eq((int)$extra['rootID'])->andWhere('branch')->eq($extra['branch'])->fetchAll('module');
                }
                else
                {