Merge branch 'feature-canvas' into 'master'

非空判断

See merge request !2483

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

@@ -518,7 +518,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
     public void doPlanSendInfo(Long ownerLogId) {
         logger.info("开始群群发统计{}", ownerLogId);
         TabGroupChatPlanOwnerLog ownerLog = this.groupChatPlanOwnerLogService.getById(ownerLogId);
-        if (ownerLog.getSendStatus() == 2 && null != ownerLog.getSendTime() && ownerLog.getSendTime().getTime() > System.currentTimeMillis()-1000*60*60*12) {
+        if (ownerLog.getSendStatus() == 2 && null != ownerLog.getSendTime() && ownerLog.getSendTime().getTime() < System.currentTimeMillis()-1000*60*60*12) {
             logger.info("已统计过");
             return;
         }