Fixed EMM-1001

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java

@@ -609,7 +609,7 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
             stmt.setString(index++, status.toString());
             stmt.setInt(index, tenantId);
             rs = stmt.executeQuery();
-            if (rs.next()) {
+            while (rs.next()) {
                 enrolments.add(DeviceManagementDAOUtil.loadEnrolment(rs));
             }
             return enrolments;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java

@@ -97,7 +97,7 @@ public class OperationManagerImpl implements OperationManager {
                     List<EnrolmentInfo> enrolments;
                     try {
                         DeviceManagementDAOFactory.openConnection();
-                        enrolments = deviceDAO.getEnrolmentsByStatus(deviceIds, EnrolmentInfo.Status.ACTIVE, tenantId);
+                        enrolments = deviceDAO.getEnrolmentsByStatus(authorizedDeviceList, EnrolmentInfo.Status.ACTIVE, tenantId);
                     } catch (SQLException e) {
                         throw new OperationManagementException("Error occurred while opening a connection the data " +
                                                                "source", e);