Fix to display statistics in webapps

Fixed to display the subscription statistics in web apps also.

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

@@ -1590,20 +1590,23 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
         int deviceCount = 0;
         try {
             Connection connection = GroupManagementDAOFactory.getConnection();
-            String sql = "SELECT COUNT(e.ID) AS COUNT " +
+            StringBuilder sql = new StringBuilder("SELECT COUNT(e.ID) AS COUNT " +
                     "FROM DM_GROUP d " +
                     "INNER JOIN DM_DEVICE_GROUP_MAP m ON d.ID = m.GROUP_ID " +
                     "INNER JOIN DM_ENROLMENT e ON m.DEVICE_ID = e.DEVICE_ID " +
                     "INNER JOIN DM_DEVICE r ON e.DEVICE_ID = r.ID " +
                     "WHERE d.TENANT_ID = ? " +
                     "AND d.GROUP_NAME = ? " +
-                    "AND r.DEVICE_TYPE_ID = ? " +
+                    "AND e.STATUS NOT IN ('REMOVED', 'DELETED')");
-                    "AND e.STATUS NOT IN ('REMOVED', 'DELETED')";
+            if (deviceTypeId != 0) {
-
+                sql.append(" AND r.DEVICE_TYPE_ID = ?");
-            try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+            }
+            try (PreparedStatement preparedStatement = connection.prepareStatement(sql.toString())) {
                 preparedStatement.setInt(1, tenantId);
                 preparedStatement.setString(2, groupName);
+                if (deviceTypeId != 0) {
                     preparedStatement.setInt(3, deviceTypeId);
+                }
                 try (ResultSet resultSet = preparedStatement.executeQuery()) {
                     if (resultSet.next()) {
                         deviceCount = resultSet.getInt("COUNT");
@@ -1618,3 +1621,5 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
         }
     }
 }
+
+