Merge remote-tracking branch 'origin/master'

linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/bdshdb/customer/scheduled/ScheduledIntelligentService.java

@@ -82,6 +82,7 @@ public class ScheduledIntelligentService {
                 .orderByAsc(WeIntelligentMark::getActionId));
 
         markList.forEach(s -> {
+            log.info("----------打标类型：-----------" + s.getActionName());
             String actionId = s.getActionId();
             WeTag weTag1 = weTagMapper.selectOne(new LambdaQueryWrapper<WeTag>().eq(WeTag::getTagId, s.getTagId()));
             if ("ACT001".equals(actionId)) { //好友添加
@@ -90,6 +91,7 @@ public class ScheduledIntelligentService {
                 //查询企业客户未打添加好友标签的人员,打标签
                 List<WeCustomer> customerList = weCustomerList.stream().filter(weCustomer -> weCustomer.getTrackState() == 1)
                         .collect(Collectors.toList());
+                log.info("----------未打添加好友标签的人员数量：-----------" + customerList.size());
                 if (customerList.size() > 0) {
                     customerList.forEach(c -> {
                         List<String> list = getStrings(c);
@@ -318,7 +320,12 @@ public class ScheduledIntelligentService {
 
     private List<String> getStrings(WeCustomer t) {
         String tagIds = t.getTagIds();
-        String[] split = tagIds.split(",");
+        String[] split = new String[0];
+        if (tagIds != null) {
+            split = tagIds.split(",");
+        }else {
+            return new ArrayList<>();
+        }
         return new ArrayList<>(Arrays.asList(split));
     }