diff --git a/application/index/controller/User.php b/application/index/controller/User.php index 57ba9530..59425335 100644 --- a/application/index/controller/User.php +++ b/application/index/controller/User.php @@ -49,25 +49,14 @@ public function deleteImages($deleteId = null) try { $id = $deleteId ? $deleteId : $this->request->post('id'); $deletes = []; // 需要删除的文件 - if (is_array($id)) { - $images = $this->user->images()->where('id', $id)->select(); - foreach ($images as &$value) { - // 查找是否有相同 md5 的文件记录,有的话则只删除记录不删除文件 - if (!$this->exists($value)) { - $deletes[$value->strategy][] = $value->pathname; - } - $value->delete(); - unset($value); - } - } else { - $image = $this->user->images()->where('id', $id)->find(); - if (!$image) { - throw new Exception('没有找到该图片数据'); - } - if (!$this->exists($image)) { - $deletes[$image->strategy][] = $image->pathname; + $images = $this->user->images()->where('id', 'in', $id)->select(); + foreach ($images as &$value) { + // 查找是否有相同 md5 的文件记录,有的话则只删除记录不删除文件 + if (!$this->exists($value)) { + $deletes[$value->strategy][] = $value->pathname; } - $image->delete(); + $value->delete(); + unset($value); } // 是否开启软删除(开启了只删除记录,不删除文件) if (!$this->getConfig('soft_delete')) { diff --git a/application/index/controller/admin/Images.php b/application/index/controller/admin/Images.php index 59b501ff..8e614aa5 100644 --- a/application/index/controller/admin/Images.php +++ b/application/index/controller/admin/Images.php @@ -77,25 +77,14 @@ public function delete() try { $id = $this->request->post('id'); $deletes = []; // 需要删除的文件 - if (is_array($id)) { - $images = ImagesModel::all($id); - foreach ($images as &$value) { - // 查找是否有相同 md5 的文件记录,有的话则只删除记录不删除文件 - if (!$this->exists($value)) { - $deletes[$value->strategy][] = $value->pathname; - } - $value->delete(); - unset($value); - } - } else { - $image = ImagesModel::get($id); - if (!$image) { - throw new Exception('没有找到该图片数据'); - } - if (!$this->exists($image)) { - $deletes[$image->strategy][] = $image->pathname; + $images = ImagesModel::where('id', 'in', $id)->select(); + foreach ($images as &$value) { + // 查找是否有相同 md5 的文件记录,有的话则只删除记录不删除文件 + if (!$this->exists($value)) { + $deletes[$value->strategy][] = $value->pathname; } - $image->delete(); + $value->delete(); + unset($value); } // 是否开启软删除(开启了只删除记录,不删除文件) if (!$this->getConfig('soft_delete')) {