From 77d18538783abd6118daab9e152000658ff7b016 Mon Sep 17 00:00:00 2001
From: jinianlan <jinianlan@qq.com>
Date: Tue, 23 Jul 2019 16:00:11 +0800
Subject: [PATCH] * fix task #2651,#2642

---
 module/task/model.php | 2 +-
 module/todo/model.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 73b8fb7ec0..555c3b7a97 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2611,7 +2611,7 @@ class taskModel extends model
                 break;
             case 'pri':
                 echo "<span class='label-pri label-pri-" . $task->pri . "' title='" . zget($this->lang->task->priList, $task->pri, $task->pri) . "'>";
-  周期待办测试2周期待办测试2              echo zget($this->lang->task->priList, $task->pri, $task->pri);
+                echo zget($this->lang->task->priList, $task->pri, $task->pri);
                 echo "</span>";
                 break;
             case 'name':
diff --git a/module/todo/model.php b/module/todo/model.php
index 625f55ec43..7d74c9654d 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -462,6 +462,7 @@ class todoModel extends model
      */
     public function createByCycle($todoList)
     {
+        a($todoList);
         $this->loadModel('action');
         $today = helper::today();
         $now   = helper::now();
@@ -490,13 +491,13 @@ class todoModel extends model
             $newTodo->assignedBy = $todo->assignedBy;
             if($todo->assignedTo) $newTodo->assignedDate = $now;
 
-            $date   = '';
             $start  = strtotime($begin);
             $finish = strtotime("$today +{$beforeDays} days");
             foreach(range($start, $finish, 86400) as $today)
             {
                 $today     = date('Y-m-d', $today);
                 $lastCycle = zget($lastCycleList, $todoID, '');
+                $date      = '';
 
                 if($todo->config->type == 'day')
                 {
@@ -535,7 +536,6 @@ class todoModel extends model
 
                 $this->dao->insert(TABLE_TODO)->data($newTodo)->exec();
                 $this->action->create('todo', $this->dao->lastInsertID(), 'opened', '', '', $newTodo->account);
-                if($today>$begin) continue;
                 $lastCycleList[$todoID] = $newTodo;
             }
         }