Merge branch release/21.7.2 of zentao/zentaopms (#9878)

2025-06-25 10:57:12 +08:00
parent 43dbc0b81c 5183c4b099
commit 2c6dc060ef
1 changed files with 5 additions and 2 deletions
@@ -277,8 +277,11 @@ class screen extends control
                }
                $fields = json_decode($chart->fields, true);

-                $fieldObj = zget($fields, $field);
-                $objectPairs = $this->loadModel('pivot')->getSysOptions($fieldObj['type'], $fieldObj['object'], $fieldObj['field'], $chart->sql, $saveAs);
+                $fieldObj  = zget($fields, $field);
+                $fieldType = $fieldObj['type'];
+                $field     = $fieldType != 'options' && $fieldType != 'object' ? $field : $fieldObj['field'];
+
+                $objectPairs = $this->loadModel('pivot')->getSysOptions($fieldType, $fieldObj['object'], $field, $chart->sql, $saveAs);
            }
        }