* [perf] Fix error.

2024-11-20 15:42:49 +08:00
parent 28200cb337
commit 1b01378120
5 changed files with 116 additions and 19 deletions
@@ -244,7 +244,12 @@ class settingModel extends model
     */
    public function getSysAndPersonalConfig(string $account = ''): array
    {
-        $records = $this->cache->setting->getSysAndPersonalConfig($account);
+        $owner = 'system,' . ($account ? $account : '');
+        $records = $this->dao->select('*')->from(TABLE_CONFIG)
+            ->where('owner')->in($owner)
+            ->beginIF(!$this->app->upgrading)->andWhere('vision')->in(array('', $this->config->vision))->fi()
+            ->orderBy('id')
+            ->fetchAll('id');
        if(!$records) return array();

        $vision = $this->config->vision;