From 8878e178568038f81612e818ea80c5fc078dd95a Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 17:35:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=86=99=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseInvoiceManualCheckServiceImpl.java    | 29 ++++++++++---------
 .../resources/mapper/BaseSggxcxMapper.xml     |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index 4c80b9eb..1dc3af1d 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -486,8 +486,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                 }
             }
 
-            int curr = (int) pramsMap.get("curr");
-            int size = (int) pramsMap.get("size");
+
 
             String hjsl = "0";
             String hjje = "0";
@@ -508,20 +507,24 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                 return super.responseResult(json);
             }
 
-            int total = Integer.parseInt(hjsl);
-
-            int totalPage = total % size == 0?total/size:total/size+1;
+            String isChooseAll = (String) pramsMap.get("isChooseAll");
 
-            if (curr<1){
-                curr =1;
-            }
-            if (curr>totalPage){
-                curr = totalPage;
-            }
-            curr = (curr -1)*size;
-            pramsMap.put("curr",curr);
+            if ("N".equals(isChooseAll)){
+                int total = Integer.parseInt(hjsl);
 
+                int curr = (int) pramsMap.get("curr");
+                int size = (int) pramsMap.get("size");
+                int totalPage = total % size == 0?total/size:total/size+1;
 
+                if (curr<1){
+                    curr =1;
+                }
+                if (curr>totalPage){
+                    curr = totalPage;
+                }
+                curr = (curr -1)*size;
+                pramsMap.put("curr",curr);
+            }
 
             List<BaseTDxRecordInvoice> pageList = super.baseMapper.selectInTellingCheck(pramsMap);
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index cd6f421b..4ab17fad 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1411,7 +1411,7 @@
             </if>
 
             ORDER BY tax_amount
-            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'Y'">
+            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'Y'.toString()">
                 limit #{curr},#{size}
             </if>