fix 冲突

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

@@ -65,7 +65,7 @@ public class KbKnowledgeProjectController {
                 return Result.error("查询非顶级节点列表时需要projectId参数");
             }
         }
-        return  knowledgeProjectService.lists(sign,projectId,category,httpServletRequest);
+        return  knowledgeProjectService.lists(sign,projectId,category);
 
     }
 

src/main/java/com/zzsn/knowbase/service/KbKnowledgeProjectService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zzsn.knowbase.entity.KbKnowledgeProject;
 import com.zzsn.knowbase.vo.Result;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -27,7 +29,6 @@ public interface KbKnowledgeProjectService extends IService<KbKnowledgeProject>
 
     Result<?> del(String id);
 
-    Result<?> lists(String sign, String projectId, String category, HttpServletRequest httpServletRequest);
     Result<?> lists(String sign, String projectId, String category);
 
     /**

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

@@ -3,8 +3,6 @@ package com.zzsn.knowbase.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -124,13 +122,7 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
     }
 
     @Override
-    public Result<?> lists(String sign, String projectId, String category, HttpServletRequest request) {
-
-        String token = request.getHeader("X-Access-Token");
-
-        Result<?> result = kbAuthorizedUserService.userPermission(token);
-
-        UserInfoVo bean = JSONUtil.toBean(JSON.toJSONString(result.getResult()), UserInfoVo.class);
+    public Result<?> lists(String sign, String projectId, String category) {
 
 
         //这个用户所拥有的所有的分类的权限
@@ -149,6 +141,13 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
         return Result.OK(kbKnowledgeProjects);
     }
 
+    @Override
+    public List<KbKnowledgeProject> getTreeListBy(String id) {
+        return baseMapper.selectList(new LambdaQueryWrapper<KbKnowledgeProject>()
+                .like(KbKnowledgeProject::getFullPath, id)
+        );
+    }
+
     /**
      * 根据所传pid查询旧的父级节点的子节点并修改相应状态值
      * @param pid

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

@@ -15,12 +15,10 @@ import com.zzsn.knowbase.enums.KnowTypeEnum;
 import com.zzsn.knowbase.kafka.message.KnowledgeMessage;
 import com.zzsn.knowbase.kafka.producer.ProduceInfo;
 import com.zzsn.knowbase.service.IKnowledgeService;
-import com.zzsn.knowbase.service.ILocalFileService;
 import com.zzsn.knowbase.service.KbKnowledgeProjectService;
 import com.zzsn.knowbase.util.*;
 import com.zzsn.knowbase.vo.KnowledgeParam;
 import com.zzsn.knowbase.vo.KnowledgeVO;
-import com.zzsn.knowbase.vo.Result;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.action.search.SearchRequest;
@@ -38,18 +36,11 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.util.WebUtils;
-import springfox.documentation.spring.web.json.Json;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static org.apache.commons.lang3.StringUtils.split;
-
 /**
  * @Description: 知识
  * @Author: chenshiqiang
@@ -170,7 +161,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         if(treeList.isEmpty()){
             return null;
         }
-        List<Long> catList = treeList.stream().map(KbKnowledgeProject::getId).collect(Collectors.toList());
+        List<String> catList = treeList.stream().map(KbKnowledgeProject::getId).collect(Collectors.toList());
         SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_KNOWLEDGE);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         //设置分页参数