Merge branch 'master' of https://github.com/easysoft/zentaopms

2017-11-17 15:02:35 +08:00
parent bda8f7434f cc173a41f6
commit a12fefb2a6
16 changed files with 124 additions and 30 deletions
@@ -178,7 +178,7 @@ class treeModel extends model
     */
    public function getLinePairs()
    {
-        return $this->dao->select('id, name')->from(TABLE_MODULE)->where('type')->eq('line')->fetchPairs();
+        return $this->dao->select('id, name')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('deleted')->eq(0)->fetchPairs();
    }

    /**