From 61cb1cf7ae1581e9d135c9eee7e887275d4ae31a Mon Sep 17 00:00:00 2001
From: leej1012 <jlee921012@163.com>
Date: Wed, 5 Feb 2025 14:31:18 +0800
Subject: [PATCH] Update getAddressStakingSnapshot and getAddressStakingRewards

---
 .../ontio/service/impl/NodesServiceImpl.java     | 16 ++++++++++++----
 .../main/resources/mapper/GovernanceMapper.xml   |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/back-end-projects/Explorer/src/main/java/com/github/ontio/service/impl/NodesServiceImpl.java b/back-end-projects/Explorer/src/main/java/com/github/ontio/service/impl/NodesServiceImpl.java
index e8aa75c6..6ff9b0f3 100644
--- a/back-end-projects/Explorer/src/main/java/com/github/ontio/service/impl/NodesServiceImpl.java
+++ b/back-end-projects/Explorer/src/main/java/com/github/ontio/service/impl/NodesServiceImpl.java
@@ -1345,13 +1345,21 @@ public ResponseBean getAddressRegisterNodeOnt(String address) {
 
     @Override
     public ResponseBean getAddressStakingRewards(String address, String publicKey, Integer round) {
-        List<StakingRewardsDto> list = governanceMapper.getStakingRewardsByAddress(address, publicKey, round);
-        return new ResponseBean(ErrorInfo.SUCCESS.code(), ErrorInfo.SUCCESS.desc(), list);
+        if (round < 244) {
+            return new ResponseBean(ErrorInfo.SUCCESS.code(), ErrorInfo.SUCCESS.desc(), Collections.emptyList());
+        } else {
+            List<StakingRewardsDto> list = governanceMapper.getStakingRewardsByAddress(address, publicKey, round);
+            return new ResponseBean(ErrorInfo.SUCCESS.code(), ErrorInfo.SUCCESS.desc(), list);
+        }
     }
 
     @Override
     public ResponseBean getAddressStakingSnapshot(String address, String publicKey, Integer round) {
-        List<StakingRewardsDto> list = governanceMapper.getStakingSnapshotByAddress(address, publicKey, round);
-        return new ResponseBean(ErrorInfo.SUCCESS.code(), ErrorInfo.SUCCESS.desc(), list);
+        if (round < 244) {
+            return new ResponseBean(ErrorInfo.SUCCESS.code(), ErrorInfo.SUCCESS.desc(), Collections.emptyList());
+        } else {
+            List<StakingRewardsDto> list = governanceMapper.getStakingSnapshotByAddress(address, publicKey, round);
+            return new ResponseBean(ErrorInfo.SUCCESS.code(), ErrorInfo.SUCCESS.desc(), list);
+        }
     }
 }
diff --git a/back-end-projects/Explorer/src/main/resources/mapper/GovernanceMapper.xml b/back-end-projects/Explorer/src/main/resources/mapper/GovernanceMapper.xml
index 9b01c01e..9d3aefad 100644
--- a/back-end-projects/Explorer/src/main/resources/mapper/GovernanceMapper.xml
+++ b/back-end-projects/Explorer/src/main/resources/mapper/GovernanceMapper.xml
@@ -60,7 +60,7 @@
         FROM tbl_income_info
         <where>
             address = #{address}
-            AND ong_income+0 > 0
+            AND staking_pos > 0
             <if test="publicKey !=null and publicKey != ''">
                 AND peer_pub_key = #{publicKey}
             </if>