Pre Merge pull request !151 from qmit/master

pull/151/MERGE
qmit 2019-11-10 05:38:04 +08:00 committed by Gitee
commit e923e3a7f3
1 changed files with 5 additions and 3 deletions

View File

@ -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($filterArr)]);
$mimetypeQuery = function ($query) use ($mimetype) {
$mimetypeArr = explode(',', $mimetype);
foreach ($mimetypeArr as $index => $item) {
$query->whereOr('mimetype', 'like', '%' . $item . '%');
}