Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -130,7 +130,7 @@ public class UserAbsenceService {
|
|||||||
boolean isComtPresent = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
|
boolean isComtPresent = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
|
||||||
|
|
||||||
if (assenzaItem.getCodJcom() != null || isComtPresent) {
|
if (assenzaItem.getCodJcom() != null || isComtPresent) {
|
||||||
String sql = Query.format(
|
sql = Query.format(
|
||||||
"SELECT parent_activity_id\n" +
|
"SELECT parent_activity_id\n" +
|
||||||
"FROM stb_activity\n" +
|
"FROM stb_activity\n" +
|
||||||
" INNER JOIN (SELECT activity_type_id, flag_tipologia\n" +
|
" INNER JOIN (SELECT activity_type_id, flag_tipologia\n" +
|
||||||
|
|||||||
Reference in New Issue
Block a user