Merge branch 'zentaobiz39_bi_wangyuting' into 'master'

* Fix chart browse bug. See merge request easycorp/zentaopms!7497
2023-04-20 03:14:39 +00:00
parent 7fcfc0a769 e3818f2999
commit 668d9689b1
1 changed files with 4 additions and 0 deletions
@@ -100,10 +100,14 @@ class chartModel extends model
        if(!$groups) return array('', array());

        $chartGroups = array();
+        $this->loadModel('screen');
        foreach($groups as $group)
        {
            $chartGroups[$group->id] = $this->dao->select('*')->from(TABLE_CHART)
                ->where('deleted')->eq(0)
+                ->andWhere('builtin', true)->eq('0')
+                ->orWhere('id')->in($this->config->screen->builtinChart)
+                ->markRight(1)
                ->andWhere("FIND_IN_SET($group->id, `group`)")
                ->andWhere('stage')->ne('draft')
                ->orderBy($orderBy)