From 28be762db9eba4a5d1845024c2a808d5107f26d6 Mon Sep 17 00:00:00 2001
From: gaojiaqi <gaojiaqi7@huawei.com>
Date: Mon, 24 Mar 2025 14:26:28 +0800
Subject: [PATCH] update

Signed-off-by: gaojiaqi <gaojiaqi7@huawei.com>
---
 services/reminder/src/reminder_datashare_helper.cpp |  6 +-----
 services/reminder/src/reminder_store.cpp            | 12 ++----------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/services/reminder/src/reminder_datashare_helper.cpp b/services/reminder/src/reminder_datashare_helper.cpp
index 66c2b07a3..0d31116f9 100644
--- a/services/reminder/src/reminder_datashare_helper.cpp
+++ b/services/reminder/src/reminder_datashare_helper.cpp
@@ -139,16 +139,12 @@ bool ReminderDataShareHelper::Query(std::map<std::string, sptr<ReminderRequest>>
         return false;
     }
 
-    bool isAtLastRow = false;
-    int32_t ret = resultSet->IsAtLastRow(isAtLastRow);
-    while (ret == 0 && !isAtLastRow) {
-        resultSet->GoToNextRow();
+    while (resultSet->GoToNextRow() == NativeRdb::E_OK) {
         sptr<ReminderRequest> reminder = CreateReminder(resultSet);
         if (reminder == nullptr) {
             continue;
         }
         reminders[reminder->GetIdentifier()] = reminder;
-        ret = resultSet->IsAtLastRow(isAtLastRow);
     }
     ReleaseDataShareHelper(helper);
     ANSR_LOGD("Query size: %{public}d.", static_cast<int32_t>(reminders.size()));
diff --git a/services/reminder/src/reminder_store.cpp b/services/reminder/src/reminder_store.cpp
index a1e356a8a..ca32a429f 100644
--- a/services/reminder/src/reminder_store.cpp
+++ b/services/reminder/src/reminder_store.cpp
@@ -177,10 +177,7 @@ std::vector<sptr<ReminderRequest>> ReminderStore::ReminderStoreDataCallBack::Get
         return reminders;
     }
 
-    bool isLastRow = false;
-    queryResult->IsAtLastRow(isLastRow);
-    while (!isLastRow) {
-        queryResult->GoToNextRow();
+    while (queryResult->GoToNextRow() == NativeRdb::E_OK) {
         int32_t reminderId;
         int32_t reminderType;
         GetInt32Val(queryResult, ReminderTable::REMINDER_ID, reminderId);
@@ -210,7 +207,6 @@ std::vector<sptr<ReminderRequest>> ReminderStore::ReminderStoreDataCallBack::Get
         if (reminderReq != nullptr) {
             reminders.push_back(reminderReq);
         }
-        queryResult->IsAtLastRow(isLastRow);
     }
     return reminders;
 }
@@ -758,15 +754,11 @@ std::vector<sptr<ReminderRequest>> ReminderStore::GetReminders(const std::string
     if (queryResultSet == nullptr) {
         return reminders;
     }
-    bool isAtLastRow = false;
-    int32_t ret = queryResultSet->IsAtLastRow(isAtLastRow);
-    while (ret == NativeRdb::E_OK && !isAtLastRow) {
-        queryResultSet->GoToNextRow();
+    while (queryResultSet->GoToNextRow() == NativeRdb::E_OK) {
         sptr<ReminderRequest> reminder = BuildReminder(queryResultSet);
         if (reminder != nullptr) {
             reminders.push_back(reminder);
         }
-        ret = queryResultSet->IsAtLastRow(isAtLastRow);
     }
     ANSR_LOGD("Size=%{public}zu", reminders.size());
     return reminders;
-- 
Gitee