Index: src/main/groovy/com/lemans/services/document/DocumentManagerService.groovy =================================================================== diff -u -ref22952d522124b615c42c4fe3e3db119fd516b0 -re67e153e240569912923a32c8bb1056820592bf7 --- src/main/groovy/com/lemans/services/document/DocumentManagerService.groovy (.../DocumentManagerService.groovy) (revision ef22952d522124b615c42c4fe3e3db119fd516b0) +++ src/main/groovy/com/lemans/services/document/DocumentManagerService.groovy (.../DocumentManagerService.groovy) (revision e67e153e240569912923a32c8bb1056820592bf7) @@ -66,6 +66,10 @@ void createDocument(String entityClass, String entityId, Integer documentClassificationId, String username, List errors, String usernameOnly) { Map userDetails = userDetails(usernameOnly) + if (!userDetails.documentUrl) { + errors << 'Signature not found, Please add signature before generating document' + return + } deleteExistingDocuments(entityClass, entityId, documentClassificationId, username) String classificationName = classificationName(documentClassificationId) if (classificationName in NO_FORM_DOCUMENTS) { @@ -220,13 +224,13 @@ documentEntity } - Map userDetails(String username) { + Map userDetails(String username) { Map userInfo = dqx([userName: username]).executeOneFrom('appSecurity.dbo.[user]', ['userName = :userName', "dealerCode = 'LEMANSCORP'"]) Map documentInfo = dqx([entityId: username]).executeOneFrom('export.vwDocumentEntity', ["entityClass = 'Signature'", 'entityId = :entityId']) if (documentInfo) { userInfo + [documentUrl: "${mediaPath}${documentInfo.documentUrl}.${documentInfo.extension}"] } else { - userInfo + userInfo + [documentUrl: null] } }