修正column方法对json字段的支持

top-think · Aug 30, 2024 · e7d20dd · e7d20dd
1 parent df85867
commit e7d20dd
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/db/BaseQuery.php b/src/db/BaseQuery.php
@@ -394,9 +394,17 @@ public function column(string | array $field, string $key = ''): array
         if ($this->model) {
             return array_map(function ($item) use ($field) {
                 if (is_array($item)) {
+                    // JSON数据处理
+                    if (!empty($this->options['json'])) {
+                        $this->jsonModelResult($item);
+                    }
                     return $this->model->newInstance($item)->toarray();
                 }
                 $array[$field] = $item;
+                // JSON数据处理
+                if (!empty($this->options['json'])) {
+                    $this->jsonModelResult($array);
+                }
                 return $this->model->newInstance($array)->getAttr($field);
             }, $result);
         }