FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: 内外部会议模块数据条数不正确修改

Browse Source
This commit is contained in:
wxyclub
2023-11-10 10:45:55 +08:00
parent c0b42bd2be
commit b427f9ccaa
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java
+1 -1
View File
@@ -16,7 +16,7 @@ import java.util.List;
@Mapper @Mapper
public interface InsideOutsideMeetingDao extends BaseMapper<InsideOutsideMeeting> { public interface InsideOutsideMeetingDao extends BaseMapper<InsideOutsideMeeting> {
Integer queryByPageCount(InsideOutsideMeetingVO page); List<Integer> queryByPageCount(InsideOutsideMeetingVO page);
List<InsideOutsideMeetingVO> queryByPage(InsideOutsideMeetingVO page); List<InsideOutsideMeetingVO> queryByPage(InsideOutsideMeetingVO page);
adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
+1 -1
View File
@@ -187,7 +187,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
page.setSortField("ID"); page.setSortField("ID");
page.setSortMode("asc"); page.setSortMode("asc");
} }
Integer rowCount = this.baseMapper.queryByPageCount(page); int rowCount = this.baseMapper.queryByPageCount(page).size();
page.getPager().setRowCount(rowCount); page.getPager().setRowCount(rowCount);
List<InsideOutsideMeetingVO> insideOutsideMeetingVOList = this.baseMapper.queryByPage(page); List<InsideOutsideMeetingVO> insideOutsideMeetingVOList = this.baseMapper.queryByPage(page);
for (InsideOutsideMeetingVO insideOutsideMeeting : insideOutsideMeetingVOList) { for (InsideOutsideMeetingVO insideOutsideMeeting : insideOutsideMeetingVOList) {
adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
+2 -1
View File
@@ -88,10 +88,11 @@
</if> </if>
</sql> </sql>
<select id="queryByPageCount" resultType="java.lang.Integer"> <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 where iom.VALID_FLAG = 0
<include refid="Base_Where_Clause"/> <include refid="Base_Where_Clause"/>
<include refid="MeetingTopic_where" /> <include refid="MeetingTopic_where" />
group by iom.ID
</select> </select>
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeetingVO"> <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeetingVO">
select <include refid="Base_Column_Join_MeetingTopic_List" /> select <include refid="Base_Column_Join_MeetingTopic_List" />