Merge branch 'hy-tobacco' of ssh://132.232.112.242:7022/zhangkb/indicators into hy-tobacco

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -596,12 +596,12 @@ public class TaskServiceImpl implements TaskService {
                                     allTasks.add(task);
                                 }
                             }
-                            if (!allTasks.isEmpty()) {
+                            if (result != null && !allTasks.isEmpty()) {
                                 this.batchCreateTask(allTasks, valueTime, ruleId);
                                 rule.setLastActiveTime(now);
                                 taskRuleService.updateRuleWithInd(rule);
                                 result = Result.genOkResult();
-                            } else {
+                            } else if (result != null) {
                                 result = Result.genFailedResult("规则配置没有生成可用的任务信息");
                             }
                         } else {