添加放行条件

src/main/java/com/zzsn/knowbase/config/interceptor/KnowInterceptor.java

@@ -31,16 +31,19 @@ public class KnowInterceptor implements HandlerInterceptor {
         // 在请求处理之前进行调用（Controller方法调用之前）
         // 返回true才会继续执行后续的Interceptor和Controller
         // 返回false则取消当前请求
-        String token = request.getHeader("X-Access-Token");
 
-        KbAuthorizedUserService userService = SpringContextUtils.getBean(KbAuthorizedUserService.class);
-        Result<?> result = userService.doCheckAndGetUser(token);
-        /**第三方用户验证未通过，直接拦截请求并返回提示*/
-        if (!result.isSuccess()){
-            doRes(request,response);
-            return false;
+        if (!request.getRequestURI().contains("test")) {
+            String token = request.getHeader("X-Access-Token");
+
+            KbAuthorizedUserService userService = SpringContextUtils.getBean(KbAuthorizedUserService.class);
+            Result<?> result = userService.doCheckAndGetUser(token);
+            /**第三方用户验证未通过，直接拦截请求并返回提示*/
+            if (!result.isSuccess()){
+                doRes(request,response);
+                return false;
+            }
+            request.setAttribute(Constants.USER_INFO, JSONUtil.toJsonStr(result.getResult()));
         }
-        request.setAttribute(Constants.USER_INFO, JSONUtil.toJsonStr(result.getResult()));
         return true;
     }
 

src/main/java/com/zzsn/knowbase/entity/KbAuthorizedUser.java

@@ -106,7 +106,7 @@ public class KbAuthorizedUser extends Model<KbAuthorizedUser> {
     @TableField(exist = false)
     private String roleName;
     /**
-     * 知识库分类id
+     * 知识库分类id,传参使用
      */
     @TableField(exist = false)
     private String knowledgeProjectId;

src/main/java/com/zzsn/knowbase/entity/KbKnowledgeProject.java

@@ -98,6 +98,11 @@ public class KbKnowledgeProject extends Model<KbKnowledgeProject> {
      */
     @TableField("project_description")
     private String projectDescription;
+    /**
+     * 用户在这个节点的角色
+     */
+    @TableField(exist = false)
+    private String role_code;
 
 
 

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

@@ -23,8 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -153,20 +152,44 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
 
         KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
 
-        //这个用户所拥有的所有的分类的权限
-//        List<KbAuthuserKnowledgeprojectMap> list = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery().eq(KbAuthuserKnowledgeprojectMap::getAuthUserId, one.getId()));
-
-        List<KbKnowledgeProject> kbKnowledgeProjects ;
-        if ("1".equals(sign)&&StringUtils.isBlank(projectId)){
-            kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
-                    .eq(KbKnowledgeProject::getPid, KbKnowledgeProjectService.ROOT_PID_VALUE)
-                    .eq(StrUtil.isNotBlank(category),KbKnowledgeProject::getCategory,category));
+        if (0 == userInfo.getIsAll()) {
+            List<KbKnowledgeProject> kbKnowledgeProjects ;
+            if ("1".equals(sign)&&StringUtils.isBlank(projectId)){
+                kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
+                        .eq(KbKnowledgeProject::getPid, KbKnowledgeProjectService.ROOT_PID_VALUE)
+                        .eq(StrUtil.isNotBlank(category),KbKnowledgeProject::getCategory,category));
+            }else {
+                kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
+                        .eq(KbKnowledgeProject::getPid,projectId)
+                        .eq(StrUtil.isNotBlank(category),KbKnowledgeProject::getCategory,category));
+            }
+            return Result.OK(kbKnowledgeProjects);
         }else {
-            kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
-                    .eq(KbKnowledgeProject::getPid,projectId)
-                    .eq(StrUtil.isNotBlank(category),KbKnowledgeProject::getCategory,category));
+            List<KbKnowledgeProject> kbKnowledgeProjects ;
+
+            if ("1".equals(sign)&&StringUtils.isBlank(projectId)){
+                String id = userInfo.getId();
+                List<KbAuthuserKnowledgeprojectMap> list = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery()
+                        .eq(KbAuthuserKnowledgeprojectMap::getAuthUserId,id)
+                );
+                List<KbKnowledgeProject> list1 = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
+                        .in(KbKnowledgeProject::getId, list.stream().map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId).collect(Collectors.toList()))
+                );
+
+                list1.forEach(e -> {
+                    String s = e.getFullPath().split(",")[0];
+                });
+
+                kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
+                        .eq(KbKnowledgeProject::getPid, KbKnowledgeProjectService.ROOT_PID_VALUE)
+                        .eq(StrUtil.isNotBlank(category),KbKnowledgeProject::getCategory,category));
+            }else {
+                kbKnowledgeProjects = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
+                        .eq(KbKnowledgeProject::getPid,projectId)
+                        .eq(StrUtil.isNotBlank(category),KbKnowledgeProject::getCategory,category));
+            }
+            return Result.OK(kbKnowledgeProjects);
         }
-        return Result.OK(kbKnowledgeProjects);
     }
 
     @Override