项目和任务的分页查询合并到模糊查询的接口。后台增加了对keyword是否为空的判断。

site/src/main/java/com/mooctest/crowd/site/controller/CrowTestSquareController.java

@@ -89,6 +89,7 @@ public class CrowTestSquareController extends BaseSearchController {
         ProjectAndTaskDTO projectAndTaskDTO = new ProjectAndTaskDTO();
         List<CrowdTestProjectVO> list = crowdProjectService.findByNameLike(keyword);
         List<CrowdTaskVO> taskVOList = crowdTaskService.findByNameLike(keyword);
+
         projectAndTaskDTO.setCrowdTaskVOList(taskVOList);
         projectAndTaskDTO.setProjectVOList(list);
         List projectAndTaskDTOList = new ArrayList<>();

site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdProjectServiceImpl.java

@@ -61,7 +61,9 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
 
     @Override
     public List<CrowdTestProjectVO> findByNameLike(String name) {
-
+        if(name==null||name.trim().equals("")){
+            return  viewMediator.crowdTestProjects();
+        }
        return  viewMediator.findByNameLike(name);
 
 

site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdTaskServiceImpl.java

@@ -63,7 +63,9 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
 
     @Override
     public List<CrowdTaskVO> findByNameLike(String name) {
-
+        if(name==null||name.trim().equals("")){
+            return  viewMediator.crowdTaskVos();
+        }
        return  viewMediator.findTaskByNameLike(name);
 
     }