--no commit message

com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/service/subject/SelectedSubjectServiceImpl.java

@@ -465,7 +465,7 @@ public class SelectedSubjectServiceImpl extends BaseServiceImpl<SelectedSubject,
         if (StringUtils.isNotEmpty(bookName)){
           ss.setBookName(bookName);
         }
-        //startPage(pageParam);
+        startPage(pageParam);
         List<ResourceRelationListVo> subjects = mapper.selectByName(ss);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -507,19 +507,20 @@ public class SelectedSubjectServiceImpl extends BaseServiceImpl<SelectedSubject,
                     vo.setUploadTime(sdf.format(s.getCreateTime()));
                     vos.add(vo);
                 });
-        PageInfo<ResourceRelationListVo> info = new PageInfo<ResourceRelationListVo>();
-        List<ResourceRelationListVo> vs = new ArrayList<ResourceRelationListVo>();
-        //分页总个数
-        info.setTotal(vs.size());
-        //判断分页的前页列表
-        if ((pageParam.getPageNum() - 1)* pageParam.getPageSize() > vs.size()){
-            vs = null;
-        }else if ((pageParam.getPageNum() - 1)* pageParam.getPageSize() + pageParam.getPageSize() >= vs.size()){
-            vs = vs.subList((pageParam.getPageNum() - 1)* pageParam.getPageSize(), vs.size());
-        }else {
-            vs = vs.subList((pageParam.getPageNum() - 1)* pageParam.getPageSize(), (pageParam.getPageNum() - 1)* pageParam.getPageSize() + pageParam.getPageSize());
-        }
-        return info;
+//        PageInfo<ResourceRelationListVo> info = new PageInfo<ResourceRelationListVo>();
+//        List<ResourceRelationListVo> vs = new ArrayList<ResourceRelationListVo>();
+//        //分页总个数
+//        info.setTotal(vs.size());
+//        //判断分页的前页列表
+//        if ((pageParam.getPageNum() - 1)* pageParam.getPageSize() > vs.size()){
+//            vs = null;
+//        }else if ((pageParam.getPageNum() - 1)* pageParam.getPageSize() + pageParam.getPageSize() >= vs.size()){
+//            vs = vs.subList((pageParam.getPageNum() - 1)* pageParam.getPageSize(), vs.size());
+//        }else {
+//            vs = vs.subList((pageParam.getPageNum() - 1)* pageParam.getPageSize(), (pageParam.getPageNum() - 1)* pageParam.getPageSize() + pageParam.getPageSize());
+//        }
+//        return info;
+        return new PageInfo<ResourceRelationListVo>(vos);
     }
 
     /**