1、修改分页问题

src/main/java/com/link/report/service/query/impl/JimuReportQueryServiceImpl.java

@@ -33,7 +33,7 @@ public class JimuReportQueryServiceImpl implements JimuReportQueryService {
         PageInfo<JimuReportListDto> pageInfo = TableSupport.pageInfo();
         JimuReportListWq wq = new JimuReportListWq();
         BeanUtils.copyProperties(reportListVo, wq);
-        wq.setPageNum(pageInfo.getSkipNum());
+        wq.setPageNum(pageInfo.getPageNum());
         wq.setPageSize(pageInfo.getPageSize());
 
         String username = SecurityUtils.getUsername();
@@ -43,6 +43,7 @@ public class JimuReportQueryServiceImpl implements JimuReportQueryService {
             wq.setUserName(username);
         }
         wq.setUserId(userId);
+        wq.setSkipNum(pageInfo.getPageSize() * (pageInfo.getPageNum() - 1));
 
         // 查询授权报表id
         List<JimuReportListDto> list =  jimuReportDao.selectJimuReportList(wq);

src/main/resources/mapper/report/JimuReportMapper.xml

@@ -13,7 +13,9 @@
         inner join jimu_report_category jrc on jr.type = jrc.id
         <where>
             jr.del_flag =0
+            <if test="userName != null and userName != ''">
             and jr.create_by = #{userName}
+            </if>
             <if test="categoryName != null and categoryName != ''">
                 jrc.name = #{categoryName}
             </if>
@@ -72,6 +74,9 @@
             <if test="name != null and name != ''">
                 and jr.name like concat('%', #{name}, '%')
             </if>
+            <if test="userName != null and userName != ''">
+                and jr.create_by = #{userName}
+            </if>
 
 
         </where>
@@ -100,7 +105,7 @@
 
         ) huizong
         order by createTime desc
-        limit #{skipNum},#{pageSize};
+        limit #{skipNum},#{pageSize}
 
     </select>
 </mapper>