合并分支 'dev_2nd_period_test' 到 'master'
修改问题知识库搜索null的id问题 查看合并请求 laws-nio/laws-weilai!248
This commit is contained in:
+7
-1
@@ -1488,7 +1488,13 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
|||||||
List<ProblemKnowledgeBaseUserEO> problemKnowledgeBaseUserEOList = this.problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper);
|
List<ProblemKnowledgeBaseUserEO> problemKnowledgeBaseUserEOList = this.problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper);
|
||||||
|
|
||||||
if(CollectionUtils.isNotEmpty(problemKnowledgeBaseUserEOList)){
|
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。
|
//in查询该用户拥有权限的问题知识库id。
|
||||||
Map<String, Object> fieldKeyMap2 = new HashMap<>();
|
Map<String, Object> fieldKeyMap2 = new HashMap<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user