From 03d3c8230193ab4c3f14db278fd2ca1da5c92d57 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 25 Jan 2019 10:03:51 +0800
Subject: [PATCH]  * finish task #5236.

---
 module/common/model.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index b93cb7b4ea..c350a265fa 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -615,11 +615,10 @@ class commonModel extends model
                         $subMenu .= "<li class='$subActive' data-id='$subMenuItem->name'>" . html::a($subLink, $subLabel) . '</li>';
                     }
 
-                    if($subMenu)
-                    {
-                        $label   .= "<span class='caret'></span>";
-                        $subMenu  = "<ul class='dropdown-menu'>{$subMenu}</ul>";
-                    }
+                    if(empty($subMenu)) continue;
+
+                    $label   .= "<span class='caret'></span>";
+                    $subMenu  = "<ul class='dropdown-menu'>{$subMenu}</ul>";
                 }
 
                 $menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target) . $subMenu . "</li>\n";