Merge branch 'master' of https://github.com/easysoft/zentaopms

2017-11-03 00:28:03 +08:00
parent 0dc610f36b c5c3f585c4
commit 0f3189d9e8
59 changed files with 440 additions and 487 deletions
@@ -150,6 +150,8 @@ class taskModel extends model
        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;

            $inNames = in_array($tasks->name[$key], $taskNames);
            if(!$inNames || $inNames && !in_array($storyID, $storyIDs))