diff --git a/src/app/attachment/models/AttachmentModelAbstract.php b/src/app/attachment/models/AttachmentModelAbstract.php index 8cb120a9cca2ffeb8d58f77c5e37698b2e60b82e..ad0a351708afc6e78b21bde8ad855b0cadf9ae0c 100644 --- a/src/app/attachment/models/AttachmentModelAbstract.php +++ b/src/app/attachment/models/AttachmentModelAbstract.php @@ -89,8 +89,8 @@ abstract class AttachmentModelAbstract ValidatorModel::arrayType($aArgs, ['select']); $originalAttachment = AttachmentModel::getById([ - 'select' => ['path', 'filename'], - 'id' => $aArgs['id'], + 'select' => ['path', 'filename'], + 'id' => $aArgs['id'], 'isVersion' => (empty($aArgs['isVersion']) ? 'false' : 'true') ]); @@ -99,8 +99,8 @@ abstract class AttachmentModelAbstract $attachment = DatabaseModel::select([ 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'], 'table' => ['res_attachments'], - 'where' => ['path = ?', 'filename = ?', 'attachment_type = ?'], - 'data' => [$originalAttachment['path'], $PdfFilename, 'converted_pdf'], + 'where' => ['path = ?', 'filename = ?', 'attachment_type = ?', 'status != ?'], + 'data' => [$originalAttachment['path'], $PdfFilename, 'converted_pdf', 'DEL'], ]); if (empty($attachment[0])) { diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index 98cc9a01f13a1435ad4632505ca9168ef08e0da2..be33b7c0f9a61d54863914e5ba6dca107de3dc67 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -176,8 +176,8 @@ class ResController if ($extDocument['category_id'] == 'outgoing') { $attachment = AttachmentModel::getOnView([ 'select' => ['res_id', 'res_id_version', 'docserver_id', 'path', 'filename'], - 'where' => ['res_id_master = ?', 'attachment_type = ?'], - 'data' => [$aArgs['resId'], 'outgoing_mail'], + 'where' => ['res_id_master = ?', 'attachment_type = ?', 'status not in (?)'], + 'data' => [$aArgs['resId'], 'outgoing_mail', ['DEL', 'OBS']], 'limit' => 1 ]); if (!empty($attachment[0])) {