From 6480d95a357e1a30d2bd84cdbbd6d4cdc7763233 Mon Sep 17 00:00:00 2001 From: whqmit Date: Sat, 9 Nov 2019 18:21:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=B1=BB=E5=9E=8B=E7=9A=84=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=89=BE=E4=B8=8D=E5=88=B0=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E7=9A=84bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/general/Attachment.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/application/admin/controller/general/Attachment.php b/application/admin/controller/general/Attachment.php index 80414dfcf..931422c7a 100644 --- a/application/admin/controller/general/Attachment.php +++ b/application/admin/controller/general/Attachment.php @@ -36,9 +36,11 @@ class Attachment extends Backend $filter = $this->request->request('filter'); $filterArr = (array)json_decode($filter, TRUE); if (isset($filterArr['mimetype']) && stripos($filterArr['mimetype'], ',') !== false) { - $this->request->get(['filter' => json_encode(array_merge($filterArr, ['mimetype' => '']))]); - $mimetypeQuery = function ($query) use ($filterArr) { - $mimetypeArr = explode(',', $filterArr['mimetype']); + $mimetype=$filterArr['mimetype']; + unset($filterArr['mimetype']); + $this->request->get(['filter' => json_encode(array_merge($filterArr))]); + $mimetypeQuery = function ($query) use ($mimetype) { + $mimetypeArr = explode(',', $mimetype); foreach ($mimetypeArr as $index => $item) { $query->whereOr('mimetype', 'like', '%' . $item . '%'); } -- Gitee From 5030a8a9505de6bceeb2f986da3c0a92fc04a43f Mon Sep 17 00:00:00 2001 From: whqmit Date: Sat, 9 Nov 2019 18:46:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=A4=9A=E4=B8=AA=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=89=BE=E4=B8=8D=E5=88=B0=E7=9A=84bug.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/general/Attachment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/admin/controller/general/Attachment.php b/application/admin/controller/general/Attachment.php index 931422c7a..d70ffbc59 100644 --- a/application/admin/controller/general/Attachment.php +++ b/application/admin/controller/general/Attachment.php @@ -38,7 +38,7 @@ class Attachment extends Backend if (isset($filterArr['mimetype']) && stripos($filterArr['mimetype'], ',') !== false) { $mimetype=$filterArr['mimetype']; unset($filterArr['mimetype']); - $this->request->get(['filter' => json_encode(array_merge($filterArr))]); + $this->request->get(['filter' => json_encode($filterArr)]); $mimetypeQuery = function ($query) use ($mimetype) { $mimetypeArr = explode(',', $mimetype); foreach ($mimetypeArr as $index => $item) { -- Gitee