Merge remote-tracking branch 'origin/release/v11.1.0' into release/v11.1.0

Author: mjabascal10

backend/pom.xml

@@ -283,7 +283,7 @@
         <dependency>
             <groupId>com.utmstack</groupId>
             <artifactId>opensearch-connector</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>jakarta.json</groupId>

backend/src/main/java/com/park/utmstack/util/elastic/SqlPaginationUtil.java

@@ -12,10 +12,10 @@ public static String applyPagination(String query, Pageable pageable) {
 
         if (hasLimit && hasOffset) {
             return query;
-        } else if (hasLimit && !hasOffset) {
-            int offset = pageable.getPageNumber() * pageable.getPageSize();
+        } else if (hasLimit) {
+            int offset = (pageable.getPageNumber() -1 ) * pageable.getPageSize();
             return query + " OFFSET " + offset;
-        } else if (!hasLimit && hasOffset) {
+        } else if (hasOffset) {
             int pageSize = pageable.getPageSize();
             return query + " LIMIT " + pageSize;
         } else {