|
@@ -166,7 +166,23 @@ public class SopUserLogsInfoController extends BaseController
|
|
|
.filter(tagFilter.and(remarkFilter).and(timeFilter).and(levelFilter))
|
|
.filter(tagFilter.and(remarkFilter).and(timeFilter).and(levelFilter))
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ if (sopUserLogsInfo.getExTagIds() != null) {
|
|
|
|
|
+ String[] split = sopUserLogsInfo.getExTagIds().split(",");
|
|
|
|
|
+ list = list.stream()
|
|
|
|
|
+ .filter(item -> {
|
|
|
|
|
+ // 如果 sopUserLogsInfo.getExTagIds() 为 null 或者 item.getTagIds() 为 null,不过滤
|
|
|
|
|
+ if (sopUserLogsInfo.getExTagIds() == null || item.getTagIds() == null) {
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
|
|
+ for (String tagId : split){
|
|
|
|
|
+ if(item.getTagIds().indexOf(tagId)!=-1){
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ return true;
|
|
|
|
|
+ })
|
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
+ }
|
|
|
// 处理标签名称
|
|
// 处理标签名称
|
|
|
list.parallelStream().forEach(item -> {
|
|
list.parallelStream().forEach(item -> {
|
|
|
if (item.getTagIds() != null && !item.getTagIds().equals("[]") && !item.getTagIds().equals("无标签")) {
|
|
if (item.getTagIds() != null && !item.getTagIds().equals("[]") && !item.getTagIds().equals("无标签")) {
|