合并分支 'dev_2nd_period_test' 到 'master'

修改问题知识库搜索null的id问题查看合并请求 laws-nio/laws-weilai!248
2022-11-11 12:31:48 +08:00
parent 2e14fec213 9c88a2b615
commit 0337a85e84
1 changed files with 7 additions and 1 deletions
@@ -1488,7 +1488,13 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
            List<ProblemKnowledgeBaseUserEO> problemKnowledgeBaseUserEOList = this.problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper);

            if(CollectionUtils.isNotEmpty(problemKnowledgeBaseUserEOList)){
-                List<String> problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList());
+                List<String> problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().filter(e->{
+                    boolean flag = false;
+                    if(StringUtils.isNotEmpty(e.getProblemKnowledgeBaseId())){
+                        flag = true;
+                    }
+                    return flag;
+                }).map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList());

                //in查询该用户拥有权限的问题知识库id。
                Map<String, Object> fieldKeyMap2 = new HashMap<>();