Merge branch 'master' into develop

ems-engine/src/main/java/it/integry/ems/activity/service/UserAbsenceService.java

@@ -120,7 +120,16 @@ public class UserAbsenceService {
 
                 entityList.add(jtbRLavt);
 
-                if (assenzaItem.getCodJcom() != null) {
+                String sql = Query.format(
+                        "SELECT CAST(COUNT(*) AS BIT)\n" +
+                                "FROM jtb_comt\n" +
+                                "WHERE cod_jcom = %s\n",
+                        assenzaItem.getNote()
+                );
+
+                boolean isComtPresent = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
+
+                if (assenzaItem.getCodJcom() != null || isComtPresent) {
                     String sql = Query.format(
                             "SELECT parent_activity_id\n" +
                                     "FROM stb_activity\n" +