add knowledge id

src/main/java/com/seec/bok/web/controller/QuestionController.java

@@ -41,7 +41,7 @@ public class QuestionController {
             PageDTO pageDTO) {
 
         //生成Pageable变量
-        Pageable pageable = PageRequest.of(pageDTO.getPage() - 1, pageDTO.getSize(),pageDTO.toSort());
+        Pageable pageable =PageDTO.of(pageDTO);
         return questionService.search(stem,tag,knowledgeId,pageable);
     }
 

src/main/java/com/seec/bok/web/controller/RecordController.java

@@ -20,6 +20,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -68,18 +69,25 @@ public class RecordController {
         List<String> ids = recordPage.getContent().stream()
                                                 .map(Record::getQuestionId)
                                                 .collect(Collectors.toList());
-        final List<QuestionVO> questionVOS = questionService.findAllByIdIn(ids).stream()
-                                                .map(QuestionVO::of)
-                                                .collect(Collectors.toList());
-        final List<RecordVO> recordVOS=recordPage.getContent().stream()
-                                                .map(RecordVO::fromEntity)
-                                                .collect(Collectors.toList());
         final PageVO page=PageVO.builder()
                 .size(recordPage.getSize())
                 .totalPages(recordPage.getTotalPages())
                 .totalElements(recordPage.getTotalElements())
                 .number(recordPage.getNumber())
                 .build();
+        if(ids.size()==0){
+            body.put("page",page);
+            body.put("questions",new ArrayList<>(0));
+            body.put("records",new ArrayList<>(0));
+            return body;
+        }
+        final List<QuestionVO> questionVOS = questionService.findAllByIdIn(ids).stream()
+                                                .map(QuestionVO::of)
+                                                .collect(Collectors.toList());
+        final List<RecordVO> recordVOS=recordPage.getContent().stream()
+                                                .map(RecordVO::fromEntity)
+                                                .collect(Collectors.toList());
+
         body.put("page",page);
         body.put("questions",questionVOS);
         body.put("records",recordVOS);

src/main/java/com/seec/bok/web/vo/KnowledgeNodeVO.java

@@ -13,7 +13,7 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 public class KnowledgeNodeVO {
-
+    private String id;
     /** 缩写为实际使用的唯一标识 */
     private String abbreviation;
 
@@ -23,6 +23,7 @@ public class KnowledgeNodeVO {
     private String parentName;
     public static KnowledgeNodeVO of(Map<String,String> neo){
         KnowledgeNodeVO knowledgeNodeVO=new KnowledgeNodeVO();
+        knowledgeNodeVO.id=neo.get("id");
         knowledgeNodeVO.abbreviation = neo.get("abbreviation");
         knowledgeNodeVO.name = neo.get("name");
         knowledgeNodeVO.englishName = neo.get("name_eng");