From 022b0d15e3937674110752619f4fb01ce0a3ed66 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 15 Dec 2022 12:33:28 +0800
Subject: [PATCH] ...

---
 .../renren/modules/activiti/controller/ActTaskController.java  | 3 ++-
 .../renren/modules/activiti/controller/HistoryController.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
index 43d32427..0a7063a2 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
@@ -147,6 +147,7 @@ public class ActTaskController {
                 if (params.get(Constant.LIMIT) != null) {
                     limit = Integer.parseInt((String) params.get(Constant.LIMIT));
                 }
+                int mettingLimit = limit - page.getList().size();
                 if (page.getList().size() < limit) {
                     List<Map<String, Object>> meetingroom_bookTask = jdbcTemplate.queryForList("SELECT " +
                             " t_meetingroom_book.id AS `taskId`, " +
@@ -160,7 +161,7 @@ public class ActTaskController {
                             " t_meetingroom_book " +
                             " LEFT JOIN t_meetingroom ON t_meetingroom_book.room_id = t_meetingroom.id  " +
                             "WHERE " +
-                            " state = 1;");
+                            " state = 1 LIMIT " + mettingLimit);
                     List<TaskDTO> meetingroom_bookTaskDto = meetingroom_bookTask
                             .stream().map(index -> {
                                 TaskDTO taskDTO = JSON.parseObject(JSON.toJSONString(index), TaskDTO.class);
diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
index 091aae1d..1369250c 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
@@ -149,6 +149,7 @@ public class HistoryController {
                 if (params.get(Constant.LIMIT) != null) {
                     limit = Integer.parseInt((String) params.get(Constant.LIMIT));
                 }
+                int mettingLimit = limit - page.getList().size();
                 if (page.getList().size() < limit) {
                     List<Map<String, Object>> meetingroom_bookTask = jdbcTemplate.queryForList("SELECT " +
                             " t_meetingroom_book.id AS `businessKey`, " +
@@ -162,7 +163,7 @@ public class HistoryController {
                             " t_meetingroom_book " +
                             " LEFT JOIN t_meetingroom ON t_meetingroom_book.room_id = t_meetingroom.id  " +
                             "WHERE " +
-                            " state != 1 ;");
+                            " state != 1 LIMIT " + mettingLimit);
                     List<ProcessActivityDTO> meetingroom_bookTaskDto = meetingroom_bookTask
                             .stream().map(index -> {
                                 ProcessActivityDTO taskDTO = JSON.parseObject(JSON.toJSONString(index), ProcessActivityDTO.class);