From 3e681cbd1135731fae0888ff22ffdb9a83136e45 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 8 Nov 2023 14:53:53 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E4=BF=AE=E6=94=B9=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E8=AF=BE=E9=A2=98=E6=80=BB=E6=9D=A1=E6=95=B0=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java   | 2 +-
 .../sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java     | 2 +-
 .../mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml         | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java
index ddbd8f2b..62169489 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/dao/SarLawsTopicMapper.java
@@ -17,7 +17,7 @@ import java.util.List;
 @Mapper
 public interface SarLawsTopicMapper extends BaseMapper<SarLawsTopic> {
 
-    Integer queryByPageCount(SarLawsTopicVO page);
+    List<Integer> queryByPageCount(SarLawsTopicVO page);
 
     List<SarLawsTopicVO> queryByPage(SarLawsTopicVO page);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
index 7e94b4ad..eda4d874 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java
@@ -217,7 +217,7 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
             page.setSortField("ID");
             page.setSortMode("asc");
         }
-        Integer rowCount = this.baseMapper.queryByPageCount(page);
+        int rowCount = this.baseMapper.queryByPageCount(page).size();
         page.getPager().setRowCount(rowCount);
         List<SarLawsTopicVO> sarLawsTopicVOList = this.baseMapper.queryByPage(page);
         for (SarLawsTopicVO lawsTopicVO : sarLawsTopicVOList) {
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml
index 606e448c..e874943b 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml
@@ -185,13 +185,14 @@
     </sql>
 
     <select id="queryByPageCount" resultType="java.lang.Integer">
-        select count(1) from sar_laws_topic slt left join sar_laws_topic_meeting sltm on slt.ID = sltm.LAWS_TOPIC_ID
+        select count(slt.ID) from sar_laws_topic slt left join sar_laws_topic_meeting sltm on slt.ID = sltm.LAWS_TOPIC_ID
         left join sar_laws_contact_information slci1 on slt.ID = slci1.LAWS_TOPIC_ID and slci1.GROUP_TYPE = 'topicGroup'
         left join sar_laws_contact_information slci2 on slt.ID = slci2.LAWS_TOPIC_ID and slci2.GROUP_TYPE = 'inside'
         where slt.VALID_FLAG = 0
         <include refid="Base_Where_Clause"/>
         <include refid="TopicMeeting_where" />
         <include refid="ContactInformation_where" />
+        group by slt.ID
     </select>
     <select id="queryByPage" resultMap="BaseResultMap">
         select <include refid="Base_Join_Column_List" />