Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -298,7 +298,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
             log.info("没有需要处理的 SOP 用户日志。");
             return;
         }
-
+        sopUserLogsVos = sopUserLogsVos.stream().filter(e -> e.getFilterMode() == 1 || (e.getFilterMode() == 2 && StringUtils.isNotEmpty(e.getChatId()))).collect(Collectors.toList());
         String[] array = sopUserLogsVos.stream().map(SopUserLogsVo::getChatId).filter(StringUtils::isNotEmpty).toArray(String[]::new);
         Map<String, QwGroupChat> groupChatMap = new HashMap<>();
         if (array.length > 0) {

fs-service/src/main/java/com/fs/sop/vo/SopUserLogsVo.java

@@ -18,6 +18,7 @@ public class SopUserLogsVo  {
     private String corpId;
     private Integer minConversionDay;
     private Integer maxConversionDay;
+    private Integer filterMode;
     private Integer minSend;
     private Long externalId;
     private Integer maxSend;