@@ -253,14 +253,14 @@ |
||
253 | 253 | return $this; |
254 | 254 | } |
255 | 255 | |
256 | - /** |
|
257 | - * 创建新的模型实例 |
|
258 | - * @access public |
|
259 | - * @param array|object $data 数据 |
|
260 | - * @param bool $isUpdate 是否为更新 |
|
261 | - * @param mixed $where 更新条件 |
|
262 | - * @return Model |
|
263 | - */ |
|
256 | + /** |
|
257 | + * 创建新的模型实例 |
|
258 | + * @access public |
|
259 | + * @param array|object $data 数据 |
|
260 | + * @param bool $isUpdate 是否为更新 |
|
261 | + * @param mixed $where 更新条件 |
|
262 | + * @return Model |
|
263 | + */ |
|
264 | 264 | public function newInstance($data = [], $isUpdate = false, $where = null) |
265 | 265 | { |
266 | 266 | $model = new static($data); |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | // 设置当前模型 确保查询返回模型对象 |
330 | 330 | $query = Db::connect($this->connection, false, $this->query); |
331 | 331 | $query->model($this) |
332 | - ->name($this->name . $this->suffix) |
|
332 | + ->name($this->name.$this->suffix) |
|
333 | 333 | ->json($this->json, $this->jsonAssoc) |
334 | 334 | ->setJsonFieldType($this->jsonType); |
335 | 335 | |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | |
340 | 340 | // 设置当前数据表和模型名 |
341 | 341 | if (!empty($this->table)) { |
342 | - $query->table($this->table . $this->suffix); |
|
342 | + $query->table($this->table.$this->suffix); |
|
343 | 343 | } |
344 | 344 | |
345 | 345 | if (!empty($this->pk)) { |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | |
383 | 383 | // 全局作用域 |
384 | 384 | if (true === $useBaseQuery && method_exists($this, 'base')) { |
385 | - call_user_func_array([$this, 'base'], [ & $query]); |
|
385 | + call_user_func_array([$this, 'base'], [& $query]); |
|
386 | 386 | } |
387 | 387 | |
388 | 388 | $globalScope = is_array($useBaseQuery) && $useBaseQuery ? $useBaseQuery : $this->globalScope; |