Browse Source

fix:[系统管理] [菜单管理] 解决没勾权限看不到菜单的情况

feat:[系统锁定] 删除本地的系统锁定逻辑,后期从接口获取
master
memorylkf 3 weeks ago
parent
commit
9c9a118455
2 changed files with 17 additions and 17 deletions
  1. +6
    -6
      hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java
  2. +11
    -11
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java

+ 6
- 6
hxhq-auth/src/main/java/com/hxhq/auth/service/SysPasswordService.java View File

@ -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))
{

+ 11
- 11
hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java View File

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

Loading…
Cancel
Save