Db查询结果支持字段映射

Author: liu21st

src/db/concern/ModelRelationQuery.php

@@ -718,11 +718,15 @@ protected function resultToModel(array &$result): void
             $result->refreshOrigin();
         }
 
-        foreach (['hidden', 'visible', 'append', 'mapping'] as $name) {
-            if (isset($this->options[$name])) {
+        foreach (['hidden', 'visible', 'append'] as $name) {
+            if (!empty($this->options[$name])) {
                 [$value, $merge] = $this->options[$name];
                 $result->$name($value, $merge);
             }
         }
+
+        if (!empty($this->options['mapping'])) {
+            $result->mapping($this->options['mapping']);
+        }
     }
 }

src/db/concern/ResultOperation.php

@@ -105,6 +105,16 @@ protected function result(array &$result): void
         if (!empty($this->options['with_attr'])) {
             $this->getResultAttr($result, $this->options['with_attr']);
         }
+
+        // 检查字段映射
+        if (!empty($this->options['mapping'])) {
+            foreach ($this->options['mapping'] as $name => $alias) {
+                if (isset($result[$name])) {
+                    $result[$alias] = $result[$name];
+                    unset($result[$name]);
+                }
+            }
+        }        
     }
 
     /**