From 616d01b015518928a78cec4cae1aa7f5b55d3d4f Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 5 Feb 2020 17:30:21 +0800
Subject: [PATCH]  * fix bug.

---
 module/common/model.php | 6 +++++-
 module/task/model.php   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 360f5a2e39..f03e436704 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -662,7 +662,11 @@ class commonModel extends model
         echo '<li>' . html::a(helper::createLink('my', 'index'), $lang->zentaoPMS) . '</li>';
         if($moduleName != 'index')
         {
-            if(!isset($lang->menu->$mainMenu)) return;
+            if(!isset($lang->menu->$mainMenu))
+            {
+                echo "</ul>";
+                return;
+            }
             $menuLink = $lang->menu->$mainMenu;
             list($menuLabel, $module, $method) = explode('|', $menuLink);
             echo '<li>' . html::a(helper::createLink($module, $method), $menuLabel) . '</li>';
diff --git a/module/task/model.php b/module/task/model.php
index 9fefea8c62..37ade8155b 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -65,7 +65,7 @@ class taskModel extends model
             /* Check duplicate task. */
             if($task->type != 'affair')
             {
-                $result = $this->loadModel('common')->removeDuplicate('task', $task, "project=$projectID and story=$task->story");
+                $result = $this->loadModel('common')->removeDuplicate('task', $task, "project=$projectID and story=" . (int)$task->story);
                 if($result['stop'])
                 {
                     $taskIdList[$assignedTo] = array('status' => 'exists', 'id' => $result['duplicate']);