Merge remote-tracking branch 'origin/master'

src/main/java/com/zzsn/knowbase/controller/KnowledgeController.java

@@ -64,7 +64,7 @@ public class KnowledgeController {
         return Result.OK(pageList);
     }
     /**
-     * 分页列表查询
+     * 详情
      */
     @GetMapping(value = "/getById")
     public Result<?> getById(@RequestParam String id)  {
@@ -101,6 +101,7 @@ public class KnowledgeController {
             return Result.error("上传文件失败");
         }
         for (Result<KnowFile> knowFileResult : resultList) {
+            knowledge.setId(null);
             knowledgeService.addKnowledge(knowFileResult.getResult(), knowledge);
         }
         return Result.OK("添加成功！");

src/main/java/com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java

@@ -169,7 +169,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         if(null==userInfo){
             return null;
         }
-       if(Integer.valueOf("0").equals(userInfo.getIsAll())){
+       if(!Integer.valueOf("0").equals(userInfo.getIsAll())){
         List<KbAuthuserKnowledgeprojectMap>  permitKnowProjectList=knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
         //all permit
         List<String > allPermitList=permitKnowProjectList.stream()
@@ -300,7 +300,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         searchRequest.source(searchSourceBuilder);
         SearchResponse searchResponse = null;
         try {
-            searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
+                searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
         } catch (IOException e) {
             e.printStackTrace();
         }