From 4e7f837044c51ad1bf5e31cd78e5ba2615ba7f1e Mon Sep 17 00:00:00 2001 From: songchenxuan Date: Tue, 6 Feb 2024 14:38:08 +0800 Subject: [PATCH] * Fix bug #45791. --- module/screen/model.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/module/screen/model.php b/module/screen/model.php index 1a48f2b0e4..47b34555c8 100644 --- a/module/screen/model.php +++ b/module/screen/model.php @@ -1176,20 +1176,12 @@ class screenModel extends model } break; default: - if($sql and $saveAs) + if($field and $sql) { $keyField = $field; $valueField = $saveAs ? $saveAs : $field; $options = $this->getOptionsFromSql($sql, $keyField, $valueField); } - elseif($field && $sql) - { - $cols = $this->dao->query("select tt.`$field` from ($sql) tt group by tt.`$field` order by tt.`$field` desc")->fetchAll(); - foreach($cols as $col) - { - $options[$col->$field] = $col->$field; - } - } break; }