优化代码

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityReportController.java

@@ -82,8 +82,8 @@ public class CommunityReportController {
 
         int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
         int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
-        int offset = (pageNum - 1) * pageSize;
-        Page<CommunityReportData> page = new Page<>(offset, pageSize);
+        //int offset = (pageNum - 1) * pageSize;
+        Page<CommunityReportData> page = new Page<>(pageNum, pageSize);
 
         List<CommunityReportData> communityReportData = null;
         try {

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityTagController.java

@@ -173,9 +173,9 @@ public class CommunityTagController extends BaseController {
     public AjaxResult likeTags(Long userId) {
         int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
         int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
-        int offset = (pageNum - 1) * pageSize;
+        //int offset = (pageNum - 1) * pageSize;
 
-        Page<CommunityUserTag> page = new Page<>(offset, pageSize);
+        Page<CommunityUserTag> page = new Page<>(pageNum, pageSize);
         if (userId == null) {
             userId = SecurityUtils.getUserId();
         }
@@ -259,9 +259,9 @@ public class CommunityTagController extends BaseController {
 */
         int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
         int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
-        int offset = (pageNum - 1) * pageSize;
+        //int offset = (pageNum - 1) * pageSize;
 
-        Page<CommunityTagBlock> page = new Page<>(offset, pageSize);
+        Page<CommunityTagBlock> page = new Page<>(pageNum, pageSize);
         if (userId == null) {
             userId = SecurityUtils.getUserId();
         }

ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityArticleServiceImpl.java

@@ -1275,8 +1275,8 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
      */
     @Override
     public List<CommunityUserLikeVo> selectCommunityUserLikeList(Long userId, String userName, int pageNum, int pageSize, int searchType) {
-        int offset = (pageNum - 1) * pageSize;
-        Page<CommunityUserLike> page = new Page<>(offset, pageSize);
+        //int offset = (pageNum - 1) * pageSize;
+        Page<CommunityUserLike> page = new Page<>(pageNum, pageSize);
         QueryWrapper<CommunityUserLike> queryWrapper = new QueryWrapper<CommunityUserLike>()
                 .eq("user_id", userId);
         if (searchType == 1) {
@@ -1349,8 +1349,8 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
      */
     @Override
     public List<CommunityUserLikeVo> selectUserFansList(Long userId, String userName, int pageNum, int pageSize, int searchType) {
-        int offset = (pageNum - 1) * pageSize;
-        Page<CommunityUserLike> page = new Page<>(offset, pageSize);
+        //int offset = (pageNum - 1) * pageSize;
+        Page<CommunityUserLike> page = new Page<>(pageNum, pageSize);
         QueryWrapper<CommunityUserLike> queryWrapper = new QueryWrapper<CommunityUserLike>()
                 .eq("like_user_id", userId);
         if (searchType == 1) {
@@ -1358,6 +1358,7 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
         } else {
             queryWrapper.orderByAsc("create_time");
         }
+
         List<CommunityUserLike> communityUserLikes = communityUserLikeMapper.selectPage(page, queryWrapper).getRecords();
 
         List<CommunityUserLikeVo> communityUserLikeVos = new ArrayList<>();
@@ -1441,9 +1442,9 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
                 queryWrapper.orderByAsc("create_time");
             }
             //分页查询数据
-            int offset = (pageNum - 1) * pageSize;
-            Page<CommunityUserLike> page = new Page<>(offset, pageSize);
-            System.out.println("offset: " + offset);
+            //int offset = (pageNum - 1) * pageSize;
+            Page<CommunityUserLike> page = new Page<>(pageNum, pageSize);
+
             List<CommunityUserLike> communityUserLikes = communityUserLikeMapper.selectPage(page, queryWrapper).getRecords();
 
             System.out.println("communityUserLikes: " + communityUserLikes);