Merge pull request 'Add fix for apps not loading in Application Restriction Settings' (#293) from osh.silva/device-mgt-core:app-restrict-10165 into master

Reviewed-on: community/device-mgt-core#293

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/ApplicationDAOImpl.java

@@ -286,31 +286,36 @@ public class ApplicationDAOImpl implements ApplicationDAO {
                         "IS_ACTIVE, " +
                         "TENANT_ID " +
                     "FROM DM_APPLICATION " +
-                    "WHERE NOT EXISTS " +
+                    "WHERE PLATFORM = ? AND " +
-                        "(SELECT " +
+                    "TENANT_ID = ? AND " +
-                            "ID " +
+                    "NOT EXISTS (SELECT ID " +
                     "FROM DM_APPLICATION A " +
                     "WHERE A.NAME = DM_APPLICATION.NAME " +
-                        "AND A.ID < DM_APPLICATION.ID) " +
+                    "AND A.ID < DM_APPLICATION.ID AND " +
-                    "AND PLATFORM = ? " +
+                    "PLATFORM = ? AND TENANT_ID = ?) ";
-                    "AND TENANT_ID = ? ";
+
         try {
             String filter = request.getFilter();
             if (filter != null) {
                 sql = sql + "AND NAME LIKE ? ";
             }
+            if (request != null && request.getRowCount() != -1) {
                 sql = sql + "LIMIT ? OFFSET ?";
+            }
             Connection conn = this.getConnection();
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                 int paramIdx = 1;
                 stmt.setString(paramIdx++, request.getDeviceType());
                 stmt.setInt(paramIdx++, tenantId);
+                stmt.setString(paramIdx++, request.getDeviceType());
+                stmt.setInt(paramIdx++, tenantId);
                 if (filter != null){
                     stmt.setString(paramIdx++, filter);
                 }
+                if (request != null && request.getRowCount() != -1) {
                     stmt.setInt(paramIdx++, request.getRowCount());
                     stmt.setInt(paramIdx, request.getStartIndex());
-
+                }
                 try (ResultSet rs = stmt.executeQuery()) {
                     while (rs.next()) {
                         application = loadApplication(rs);