From b427f9ccaa8bdf6c80e51ff1a63ef3cce1a1c177 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Fri, 10 Nov 2023 10:45:55 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E6=9D=A1=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java | 2 +-
 .../service/impl/InsideOutsideMeetingServiceImpl.java          | 2 +-
 .../mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java
index 98537ae7..4dca1bcb 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java
@@ -16,7 +16,7 @@ import java.util.List;
 @Mapper
 public interface InsideOutsideMeetingDao extends BaseMapper<InsideOutsideMeeting> {
 
-    Integer queryByPageCount(InsideOutsideMeetingVO page);
+    List<Integer> queryByPageCount(InsideOutsideMeetingVO page);
 
     List<InsideOutsideMeetingVO> queryByPage(InsideOutsideMeetingVO page);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
index d3305cc3..250c16d0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
@@ -187,7 +187,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
             page.setSortField("ID");
             page.setSortMode("asc");
         }
-        Integer rowCount = this.baseMapper.queryByPageCount(page);
+        int rowCount = this.baseMapper.queryByPageCount(page).size();
         page.getPager().setRowCount(rowCount);
         List<InsideOutsideMeetingVO> insideOutsideMeetingVOList = this.baseMapper.queryByPage(page);
         for (InsideOutsideMeetingVO insideOutsideMeeting : insideOutsideMeetingVOList) {
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
index dda636cf..eb48940c 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
@@ -88,10 +88,11 @@
         </if>
     </sql>
     <select id="queryByPageCount" resultType="java.lang.Integer">
-        select count(1) from inside_outside_meeting iom join meeting_topic mt on iom.ID = mt.MEETING_ID
+        select count(iom.ID) from inside_outside_meeting iom join meeting_topic mt on iom.ID = mt.MEETING_ID
         where iom.VALID_FLAG = 0
         <include refid="Base_Where_Clause"/>
         <include refid="MeetingTopic_where" />
+        group by iom.ID
     </select>
     <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeetingVO">
         select <include refid="Base_Column_Join_MeetingTopic_List" />