Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'develop' into feature/JDK11
Some checks are pending
IntegryManagementSystem_Multi/pipeline/head Build queued...
Details

Browse Source
This commit is contained in:
jenkins
2025-08-29 19:32:55 +02:00
parent f9ee14335e 6df7c809a2
commit abb196d494
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ems-engine/src/main/java/it/integry/ems/document/service/DocumentService.java
View File

@@ -2142,10 +2142,10 @@ public class DocumentService {
Boolean archiviazioneElettronica = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (archiviazioneElettronica == null) archiviazioneElettronica = false;
if ( archiviazioneElettronica && !UtilityString.isNullOrEmpty(codVdes)){
if (archiviazioneElettronica && !UtilityString.isNullOrEmpty(codVdes)) {
sql = it.integry.ems_model.utility.Query.format(
"SELECT stampa_doc_cons FROM vtb_dest WHERE cod_anag= %s AND cod_vdes = %s",
printDocumentRequest.getCodAnag(), codVdes
"SELECT stampa_doc_cons FROM vtb_dest WHERE cod_anag= %s AND cod_vdes = %s",
printDocumentRequest.getCodAnag(), codVdes
);
Boolean stampaDocCons = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (stampaDocCons != null && stampaDocCons) {
@@ -2154,7 +2154,7 @@ public class DocumentService {
}
List<byte[]> listPdf = new ArrayList<>();
if (dtbTipi.getNumCopie() == null ) {
if (dtbTipi.getNumCopie() == null) {
dtbTipi.setNumCopie(1);
}
for (int i = 1; i <= dtbTipi.getNumCopie(); i++) {
@@ -2179,7 +2179,7 @@ public class DocumentService {
boolean stampaImmediata = setupGest.getSetupBoolean("W_VDIFF_BOLLE_DLG", "SETUP", "STAMPA_IMMEDIATA");
if (printDocumentRequest.isSendEmail() || stampaImmediata) {
if (printDocumentRequest.isSendEmail() || (stampaImmediata && printDocumentRequest.isStampa())) {
sql = it.integry.ems_model.utility.Query.format(
"SELECT e_mail\n" +
"FROM vtb_clie_pers_rif\n" +
@@ -2239,7 +2239,11 @@ public class DocumentService {
}
}
mailService.sendMail(null, null, elencoEmail, null, null, subject, msgText, false, fileItem);
try {
mailService.sendMail(null, null, elencoEmail, null, null, subject, msgText, false, fileItem);
} catch (Exception e) {
//NON BLOCCANTE
}
}
}