From aa6d48bfc75c7ad1503963a5b968acd33fa2b185 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 11 May 2023 18:16:14 +0800
Subject: [PATCH] =?UTF-8?q?add:PDMC=E7=B3=BB=E7=BB=9F=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=E7=B3=BB=E7=BB=9F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=9C=80=E6=B1=82=E7=B3=BB=E7=BB=9F=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=E7=B3=BB=E7=BB=9F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=9C=80=E6=B1=82=EF=BC=8C=E8=AF=BB=E5=8F=96=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=A0=91=E5=92=8C=E8=AF=BB=E5=8F=96=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PDMCSarLawsStandInfoController.java   | 12 +++++++-----
 .../dao/PDMCSarLawsStandInfoDao.java                 |  1 +
 .../service/PDMCSarLawsStandInfoService.java         |  2 ++
 .../impl/PDMCSarLawsStandInfoServiceImpl.java        |  5 +++++
 .../PDMCSarLawsStandInfoMapper.xml                   |  6 ++++++
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java
index ca2b9674..652197ae 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java
@@ -40,15 +40,17 @@ public class PDMCSarLawsStandInfoController extends BaseController<PDMCSarLawsSt
     @GetMapping("getSarStandardsInfo")
     public ResponseMessage<PageInfo<PDMCSarLawsStandInfo>> getSarStandardsInfoPage(
             @RequestParam(value = "current", defaultValue = "1") Long current,
-            @RequestParam(value = "limit",required = false,defaultValue = "100") Long limit) throws Exception {
-        if (ObjectUtil.isEmpty(current)){
-            current = 1L;
-        }
+            @RequestParam(value = "limit",required = false) Long limit) throws Exception {
         if (ObjectUtil.isEmpty(limit)){
-            limit = 100L;
+            int count = pdmcSarLawsStandInfoService.getSarStandardsCount();
+            if (count == 0) {
+                return Result.error("文件信息为空");
+            }
+            limit = (long) count;
         }
         Page<PDMCSarLawsStandInfo> page = new Page<>(current, limit);
         Page<PDMCSarLawsStandInfo> sarStandardsInfoPage = pdmcSarLawsStandInfoService.getSarStandardsInfo(page);
+
         PageInfo<PDMCSarLawsStandInfo> pdmcSarLawsStandInfoPageInfo = new PageInfo<>();
         pdmcSarLawsStandInfoPageInfo.setList(sarStandardsInfoPage.getRecords());
         pdmcSarLawsStandInfoPageInfo.setPageNo((int)sarStandardsInfoPage.getCurrent());
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java
index 9b3b216c..23595d11 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java
@@ -12,4 +12,5 @@ import java.util.List;
 public interface PDMCSarLawsStandInfoDao extends BaseMapper<PDMCSarLawsStandInfo> {
     Page<PDMCSarLawsStandInfo> getSarStandardsInfo(@Param("page")Page<PDMCSarLawsStandInfo> page);
 
+    int getSarStandardsCount();
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java
index ce24327b..2e6fb455 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java
@@ -14,4 +14,6 @@ import java.util.List;
  */
 public interface PDMCSarLawsStandInfoService extends IService<PDMCSarLawsStandInfo> {
     Page<PDMCSarLawsStandInfo> getSarStandardsInfo(Page<PDMCSarLawsStandInfo> page);
+
+    int getSarStandardsCount();
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java
index 3fb7237a..1a046032 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java
@@ -23,4 +23,9 @@ public class PDMCSarLawsStandInfoServiceImpl extends ServiceImpl<PDMCSarLawsStan
 
         return baseMapper.getSarStandardsInfo(page);
     }
+
+    @Override
+    public int getSarStandardsCount() {
+        return baseMapper.getSarStandardsCount();
+    }
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml
index 9be62eb4..33225f6f 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml
@@ -36,4 +36,10 @@
         from sar_standards_info
         left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc
     </select>
+    <select id="getSarStandardsCount" resultType="java.lang.Integer">
+        select
+        count(1)
+        from sar_standards_info
+        left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc
+    </select>
 </mapper>