1

2024-07-17 09:23:45 +08:00
parent edf9deeb1a
commit 881ac3e056
1001 changed files with 41032 additions and 5452 deletions
--- a/thinkphp/library/think/db/Query.php
+++ b/thinkphp/library/think/db/Query.php
@@ -1038,10 +1038,6 @@ class Query
        return $this;
    }

-    public function close(){
-        return $this->connection->close();
-    }
-
    /**
     * 指定OR查询条件
     * @access public
@@ -1956,7 +1952,7 @@ class Query
        if (!empty($this->pk)) {
            $pk = $this->pk;
        } else {
-            $pk = $this->getTableInfo(is_array($options) ? $options['table'] : $options, 'pk');
+            $pk = $this->getTableInfo(is_array($options) && isset($options['table']) ? $options['table'] : $options, 'pk');
        }
        return $pk;
    }