Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2c/common/help/service/impl/HelpNavServiceImpl.java

@@ -78,8 +78,8 @@ public class HelpNavServiceImpl implements HelpNavService{
             HelpNav parentHelpNav = helpNavDao.findOne(helpNav.getParentId());
             if (parentHelpNav == null)
                 throw new IllegalOperatorException("父导航不存在");
-            if (parentHelpNav.getLevel() == 1 && parentHelpNav.getCount() > 9)
-                throw new IllegalOperatorException("数量超出，一级导航下最多可创建10个二级导航");
+//            if (parentHelpNav.getLevel() == 1 && parentHelpNav.getCount() > 9)
+//                throw new IllegalOperatorException("数量超出，一级导航下最多可创建10个二级导航");
 
             helpNav.setIsLeaf((short) 1);
             helpNav.setLevel((short) (parentHelpNav.getLevel() + 1));
@@ -115,7 +115,7 @@ public class HelpNavServiceImpl implements HelpNavService{
 
             for (Iterator it = helpNavChildren.iterator(); it.hasNext();) {
                 HelpNav helpNavChild = (HelpNav)it.next();
-                if (helpNavChild.getId() == id) {
+                if (helpNavChild.getId().equals(id)) {
                     it.remove();
                 }
             }