diff --git a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java
index 2b1ae3c..ab225ff 100644
--- a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java
+++ b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java
@@ -50,12 +50,12 @@ public class SysPasswordService
             retryCount = 0;
         }
 
-        if (retryCount >= Integer.valueOf(maxRetryCount).intValue())
-        {
-            String errMsg = String.format("密码输入错误%s次，帐户锁定%s分钟", maxRetryCount, lockTime);
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL,errMsg);
-            throw new ServiceException(errMsg);
-        }
+//        if (retryCount >= Integer.valueOf(maxRetryCount).intValue())
+//        {
+//            String errMsg = String.format("密码输入错误%s次，帐户锁定%s分钟", maxRetryCount, lockTime);
+//            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL,errMsg);
+//            throw new ServiceException(errMsg);
+//        }
 
         if (!matches(user, password))
         {
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java
index 2232405..dd66ad5 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java
@@ -66,17 +66,17 @@ public class SysMenuServiceImpl implements ISysMenuService
     @Override
     public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
     {
-        List<SysMenu> menuList = null;
-        // 管理员显示所有菜单信息
-        if (SysUser.isAdmin(userId))
-        {
-            menuList = menuMapper.selectMenuList(menu);
-        }
-        else
-        {
-            menu.getParams().put("userId", userId);
-            menuList = menuMapper.selectMenuListByUserId(menu);
-        }
+        List<SysMenu> menuList = menuMapper.selectMenuList(menu);
+//        // 管理员显示所有菜单信息
+//        if (SysUser.isAdmin(userId))
+//        {
+//            menuList = menuMapper.selectMenuList(menu);
+//        }
+//        else
+//        {
+//            menu.getParams().put("userId", userId);
+//            menuList = menuMapper.selectMenuListByUserId(menu);
+//        }
         return menuList;
     }