* fix bug.

This commit is contained in:
wangyidong
2017-12-11 14:37:00 +08:00
parent 71e60a0d5e
commit 54afa9bce1
3 changed files with 8 additions and 3 deletions
+5 -1
View File
@@ -153,14 +153,18 @@ class taskModel extends model
$storyIDs = array();
$taskNames = array();
$preStory = 0;
foreach($tasks->story as $key => $storyID)
{
if(empty($tasks->name[$key])) continue;
if($tasks->type[$key] == 'affair') continue;
if($tasks->type[$key] == 'ditto' && isset($tasks->type[$key - 1]) && $tasks->type[$key - 1] == 'affair') continue;
if($storyID == 'ditto') $storyID = $preStory;
$preStory = $storyID;
$inNames = in_array($tasks->name[$key], $taskNames);
if(!$inNames || $inNames && !in_array($storyID, $storyIDs))
if(!$inNames || ($inNames && !in_array($storyID, $storyIDs)))
{
$storyIDs[] = $storyID;
$taskNames[] = $tasks->name[$key];