diff --git a/catch/system/controller/Attachments.php b/catch/system/controller/Attachments.php index 646d564..a6ad952 100644 --- a/catch/system/controller/Attachments.php +++ b/catch/system/controller/Attachments.php @@ -9,19 +9,36 @@ use think\facade\Filesystem; class Attachments extends CatchController { - + /** + * 列表 + * + * @time 2020年07月25日 + * @param AttachmentsModel $model + * @return \think\response\Json + */ public function index(AttachmentsModel $model) { return CatchResponse::paginate($model->getList()); } + /** + * 删除 + * + * @time 2020年07月25日 + * @param $id + * @param AttachmentsModel $model + * @throws \League\Flysystem\FileNotFoundException + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @return \think\response\Json + */ public function delete($id, AttachmentsModel $model) { - $ids = Utils::stringToArrayBy($id); + $attachments = $model->whereIn('id', Utils::stringToArrayBy($id))->select(); - foreach ($ids as $id) { - $attachment = $model->findBy($id); - if ($attachment && $model->deleteBy($id)) { + if ($model->deleteBy($id)) { + foreach ($attachments as $attachment) { Filesystem::delete($attachment->path); } } diff --git a/catch/system/controller/OperateLog.php b/catch/system/controller/OperateLog.php index 55d0366..b58e80e 100644 --- a/catch/system/controller/OperateLog.php +++ b/catch/system/controller/OperateLog.php @@ -34,19 +34,13 @@ class OperateLog extends CatchController /** * 批量删除 - * - * @param mixed $id - * @throws \Exception + * + * @param mixed $id + * @param Log $log * @return \think\response\Json */ public function delete($id, Log $log) { - $ids = explode(',', $id); - - if (empty($ids)) { - return false; - } - - return CatchResponse::success($log->whereIn('id', $ids)->delete()); + return CatchResponse::success($log->deleteBy($id)); } }