Merge remote-tracking branch 'origin/develop' 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:
@@ -1003,6 +1003,8 @@ public class ActivityService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
List<ActivityDTO> activityDTOS = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, ActivityDTO.class);
|
List<ActivityDTO> activityDTOS = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, ActivityDTO.class);
|
||||||
|
|
||||||
|
if (activityDTOS != null) {
|
||||||
List<String> elencoId = Stream.of(activityDTOS).map(ActivityDTO::getIdAttivita).toList();
|
List<String> elencoId = Stream.of(activityDTOS).map(ActivityDTO::getIdAttivita).toList();
|
||||||
sql =
|
sql =
|
||||||
"SELECT stb_activity.parent_activity_id,\n" +
|
"SELECT stb_activity.parent_activity_id,\n" +
|
||||||
@@ -1073,6 +1075,7 @@ public class ActivityService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return activityDTOS;
|
return activityDTOS;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user