Ver Fonte

添加排除标签

luolinsong há 2 meses atrás
pai
commit
16cef84337

+ 17 - 1
fs-company/src/main/java/com/fs/company/controller/qw/SopUserLogsInfoController.java

@@ -166,7 +166,23 @@ public class SopUserLogsInfoController extends BaseController
                         .filter(tagFilter.and(remarkFilter).and(timeFilter).and(levelFilter))
                         .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 -> {
                 if (item.getTagIds() != null && !item.getTagIds().equals("[]") && !item.getTagIds().equals("无标签")) {

+ 3 - 0
fs-service/src/main/java/com/fs/sop/domain/SopUserLogsInfo.java

@@ -92,4 +92,7 @@ public class SopUserLogsInfo implements Serializable {
 
     @TableField(exist = false)
     private String levelName;
+
+    @TableField(exist = false)
+    private String exTagIds;
 }