diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php index 6c440d0c759ffbb16bb5565fb525fdfedcdeb08c..6dd483af2457572ae2341b1788fe6d4b629eba23 100755 --- a/src/app/attachment/controllers/AttachmentController.php +++ b/src/app/attachment/controllers/AttachmentController.php @@ -128,13 +128,17 @@ class AttachmentController if ($attachment['status'] == 'SIGN') { $signedResponse = AttachmentModel::get([ - 'select' => ['res_id', 'creation_date', 'typist'], + 'select' => ['res_id', 'creation_date', 'typist', 'signatory_user_serial_id'], 'where' => ['origin = ?', 'status not in (?)'], 'data' => ["{$args['id']},res_attachments", ['DEL']] ]); if (!empty($signedResponse[0])) { $attachment['signedResponse'] = $signedResponse[0]['res_id']; - $attachment['signatory'] = UserModel::getLabelledUserById(['id' => $signedResponse[0]['typist']]); + if (!empty($signedResponse[0]['signatory_user_serial_id'])) { + $attachment['signatory'] = UserModel::getLabelledUserById(['id' => $signedResponse[0]['signatory_user_serial_id']]); + } else { + $attachment['signatory'] = UserModel::getLabelledUserById(['login' => $signedResponse[0]['typist']]); + } $attachment['signDate'] = $signedResponse[0]['creation_date']; } }