改进join查询方法多次调用

Author: liu21st

src/db/concern/JoinAndViewQuery.php

@@ -33,13 +33,17 @@ trait JoinAndViewQuery
      */
     public function join(array | string | Raw $join, ?string $condition = null, string $type = 'INNER', array $bind = [])
     {
-        $table = $this->getJoinTable($join);
+        $table = $this->getJoinTable($join, $alias);
 
         if (!empty($bind) && $condition) {
             $this->bindParams($condition, $bind);
         }
 
-        $this->options['join'][] = [$table, strtoupper($type), $condition];
+        if ($alias) {
+            $this->options['join'][$alias] = [$table, strtoupper($type), $condition];
+        } else {
+            $this->options['join'][] = [$table, strtoupper($type), $condition];
+        }
 
         return $this;
     }

src/db/concern/WhereQuery.php

@@ -453,8 +453,14 @@ protected function parseWhereExp(string $logic, $field, $op, $condition, array $
     {
         $logic = strtoupper($logic);
 
+        // 字段映射
+        $map   = $this->getOption('field_map', []);
+        if (is_string($field) && isset($map[$field])) {
+            $field = $map[$field];
+        }
+
         // 处理 via
-        if (is_string($field) && !empty($this->options['via']) && !str_contains($field, '.')) {
+        if (is_string($field) && !empty($this->options['via']) && !str_contains($field, '.') && !str_contains($field, '->')) {
             $field = $this->options['via'] . '.' . $field;
         }
 
@@ -522,19 +528,15 @@ protected function parseWhereItem(string $logic, $field, $op, $condition, array
             array_unshift($param, $field);
             return $param;
         }
-        // 获取字段映射
-        $alias = $this->getFieldMap($field);
-        if ($alias) {
-            $field = $alias;
-            if (strpos($alias, '->')) {
-                [$relation, $field] = explode('->', $alias, 2);
-
-                $type = $this->getFieldType($relation);
-                if (is_null($type)) {
-                    // 自动关联查询
-                    $this->hasWhere($relation, [[$field , is_null($condition) ? '=' : $op, $condition ?? $op]]);                    
-                    return [];
-                }
+
+        if (is_string($field) && strpos($field, '->')) {
+            [$relation, $attr] = explode('->', $field, 2);
+
+            $type = $this->getFieldType($relation);
+            if (is_null($type)) {
+                // 自动关联查询
+                $this->hasWhere($relation, [[$attr , is_null($condition) ? '=' : $op, $condition ?? $op]]);                    
+                return [];
             }
         }