administrator

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

@@ -126,7 +126,7 @@ public class KnowledgeController {
      * @return
      */
     @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id") String ids) {
+    public Result<?> delete(@RequestParam(name = "ids") String ids) {
         knowledgeService.deleteKnowledge(ids);
         return Result.OK("删除成功!");
     }

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

@@ -39,6 +39,8 @@ public class DocumentServiceImpl implements DocumentService {
     Environment environment;
     @Value("${document.server.host}")
     private String serverHost ;
+    @Value("${files.storage}")
+    String filesStorage;
     /**
      * 大小限制，默认10M
      */
@@ -65,7 +67,7 @@ public class DocumentServiceImpl implements DocumentService {
         if (StringUtils.isNotBlank(fileName) && !fileType.equalsIgnoreCase(FilenameUtils.getExtension(fileName))) {
             throw new DocumentException(ErrorCodeEnum.DOC_FILE_EXTENSION_NOT_MATCH);
         }
-        File docFile = new File(filePath);
+        File docFile = new File(filesStorage+  filePath);
         // 校验文件实体
         preFileCheck(docFile);
         fileName = StringUtils.isNotBlank(fileName) ? fileName : docFile.getName();

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

@@ -164,13 +164,12 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         List<String> catList;
         List<String> treeList = knowledgeProjectService.getTreeListBy(knowledgeParam.getKnowledgeProjectId())
                 .stream().map(KbKnowledgeProject::getId).collect(Collectors.toList());
-       if(false){
-
-       //获取用户拥有的分类
+        //获取用户拥有的分类
         KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
         if(null==userInfo){
             return null;
         }
+       if(Integer.valueOf("0").equals(userInfo.getIsAll())){
         List<KbAuthuserKnowledgeprojectMap>  permitKnowProjectList=knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
         //all permit
         List<String > allPermitList=permitKnowProjectList.stream()
@@ -324,18 +323,16 @@ class KnowledgeServiceImpl implements IKnowledgeService {
     public IPage<KnowledgeVO> listFromPython(KnowledgeParam knowledgeParam, Integer pageNo, Integer pageSize, String column, String order) {
 
         Object data = redisUtil.get(genKey(knowledgeParam));
-//        if (org.springframework.util.StringUtils.isEmpty(data)) {
-        if (true) {
+        if (org.springframework.util.StringUtils.isEmpty(data)) {
             List<String> treeList = knowledgeProjectService.getTreeListBy(knowledgeParam.getKnowledgeProjectId())
                     .stream().map(KbKnowledgeProject::getId).collect(Collectors.toList());
             List<String> permitKnowList=new ArrayList<>();
             List<String> catList=new ArrayList<>();
-           if(false){
-            //获取用户拥有的分类
             KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
             if(null==userInfo){
                 return null;
             }
+            if(Integer.valueOf("0").equals(userInfo.getIsAll())){
             List<KbAuthuserKnowledgeprojectMap>  permitKnowProjectList=knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
             //all permit
             List<String > allPermitList=permitKnowProjectList.stream()