From 8903363695690cbf5761ce82685fa44a36edf69e Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 2 Apr 2021 18:55:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/merge.js | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index be1ec97c..a0186b5f 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -253,24 +253,6 @@ class merge extends Component {
         </Menu.Item>
       </Menu>
     );
-
-    const Paginations = (
-      <React.Fragment>
-        {search_count > limit ? (
-          <div className="mt30 mb50 edu-txt-center">
-            <Pagination
-              simple
-              defaultCurrent={page}
-              total={search_count}
-              pageSize={limit}
-              onChange={this.ChangePage}
-            ></Pagination>
-          </div>
-        ) : (
-          ""
-        )}
-      </React.Fragment>
-    );
     return (
       <div className="main" style={{padding:"0px"}}>
         <div className="topWrapper" style={{borderBottom:"none",padding:"20px"}}>
@@ -419,9 +401,21 @@ class merge extends Component {
                   {...this.props}
                   {...this.state}
                 ></OrderItem>
-                {Paginations}
               </div>
             ):""}
+            {search_count > select_params.limit ? (
+              <div className="mt30 mb50 edu-txt-center">
+                <Pagination
+                  simple
+                  current={select_params.page}
+                  total={search_count}
+                  pageSize={select_params.limit}
+                  onChange={this.ChangePage}
+                ></Pagination>
+              </div>
+            ) : (
+              ""
+            )}
             { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" projectsId={projectsId} owner={owner} /> :""}
           </Spin>
         </div>