From 3157f3a5747cba14602632fbec083f8acf5beb80 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 10 Oct 2019 17:52:32 +0800
Subject: [PATCH] 优化关联查询时模型表名读取 优化插件配置数据过滤
---
application/admin/controller/Addon.php | 2 +-
application/admin/controller/general/Config.php | 4 ++--
application/common/controller/Backend.php | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php
index 7fe7946..4d4789b 100644
--- a/application/admin/controller/Addon.php
+++ b/application/admin/controller/Addon.php
@@ -61,7 +61,7 @@ class Addon extends Backend
$this->error(__('No Results were found'));
}
if ($this->request->isPost()) {
- $params = $this->request->post("row/a");
+ $params = $this->request->post("row/a", [], 'trim');
if ($params) {
foreach ($config as $k => &$v) {
if (isset($params[$v['name']])) {
diff --git a/application/admin/controller/general/Config.php b/application/admin/controller/general/Config.php
index d562c2d..8c2979c 100644
--- a/application/admin/controller/general/Config.php
+++ b/application/admin/controller/general/Config.php
@@ -74,7 +74,7 @@ class Config extends Backend
{
if ($this->request->isPost()) {
$this->token();
- $params = $this->request->post("row/a");
+ $params = $this->request->post("row/a", [], 'trim');
if ($params) {
foreach ($params as $k => &$v) {
$v = is_array($v) ? implode(',', $v) : $v;
@@ -113,7 +113,7 @@ class Config extends Backend
{
if ($this->request->isPost()) {
$this->token();
- $row = $this->request->post("row/a");
+ $row = $this->request->post("row/a", [], 'trim');
if ($row) {
$configList = [];
foreach ($this->model->all() as $v) {
diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index a8ba6db..8e3474b 100644
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -267,6 +267,7 @@ class Backend extends Controller
if ($relationSearch) {
if (!empty($this->model)) {
$name = \think\Loader::parseName(basename(str_replace('\\', '/', get_class($this->model))));
+ $name = $this->model->getTable();
$tableName = $name . '.';
}
$sortArr = explode(',', $sort);
--
libgit2 0.24.0