--no commit message

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

@@ -453,16 +453,16 @@ public class SelectedSubjectServiceImpl extends BaseServiceImpl<SelectedSubject,
 
     @Override
     public PageInfo<ResourceRelationListVo> queryAllPassed(PageParam pageParam,String bookName) {
-        if (StringUtils.isBlank(pageParam.getOrderBy())) {
-            pageParam.setOrderBy("createTime desc");
-        }
+//        if (StringUtils.isBlank(pageParam.getOrderBy())) {
+//            pageParam.setOrderBy("createTime desc");
+//        }
 
         SelectedSubject ss = new SelectedSubject();
         ss.setStatus(SelectedSubjectEnum.PASS.getCode());
         if (StringUtils.isNotEmpty(bookName)){
           ss.setBookName(bookName);
         }
-        startPage(pageParam);
+
         List<SelectedSubject> subjects = mapper.selectByName(ss);
         subjects.sort(Comparator.comparing(SelectedSubject::getCreateTime));
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -473,6 +473,7 @@ public class SelectedSubjectServiceImpl extends BaseServiceImpl<SelectedSubject,
             logger.debug("[Class:SelectedSubjectServiceImpl-line:255] 远程调用查询已绑定合同的选题数据失败");
             throw new BaseException("获取已绑定选题数据数据失败");
         }
+        //startPage(pageParam);
         List<ResourceRelationListVo> collect = subjects.parallelStream()
                 .filter(arg -> !cb.getData().contains(arg.getId()))
                 .map(s -> {
@@ -492,8 +493,12 @@ public class SelectedSubjectServiceImpl extends BaseServiceImpl<SelectedSubject,
                     return relation;
                 })
                 .collect(Collectors.toList());
-
-        return new PageInfo<>(collect);
+        PageInfo<ResourceRelationListVo> pageInfo = new PageInfo<ResourceRelationListVo>();
+        pageInfo.setPageNum(pageParam.getPageNum());
+        pageInfo.setPageSize(pageParam.getPageSize());
+        pageInfo.setTotal(collect.size());
+        pageInfo.setList(collect);
+        return pageInfo;
     }
 
     /**