From 9c9a118455d2549b74a2a49a543d2ae1a722bc9e Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Fri, 19 Dec 2025 17:10:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86]=20[?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86]=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=B2=A1=E5=8B=BE=E6=9D=83=E9=99=90=E7=9C=8B=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E6=83=85=E5=86=B5=20feat:[=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=94=81=E5=AE=9A]=20=E5=88=A0=E9=99=A4=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E7=9A=84=E7=B3=BB=E7=BB=9F=E9=94=81=E5=AE=9A=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=90=8E=E6=9C=9F=E4=BB=8E=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxhq/auth/service/SysPasswordService.java  | 12 ++++++------
 .../system/service/impl/SysMenuServiceImpl.java    | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

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;
     }