From e02f6923593bd49f87caccd87e063baf312aaa3f Mon Sep 17 00:00:00 2001
From: 稚屿 <1491182878@qq.com>
Date: 星期一, 22 八月 2022 14:19:08 +0800
Subject: [PATCH] 修复菜单管理已知问题 问题描述：在菜单管理下，类型为菜单或者按钮的条目下点击修改按钮。 情况1，如果是类型为菜单，第一次点击修改按钮正常，则第二次点击另一个条目后面的修改按钮时报错！ 情况2，如果是类型为按钮，第一次点击修改时正常，当点击取消按钮关闭弹窗时，浏览器报错！
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index a78f2c7..234a502 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -10,7 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserStatus;
-import com.ruoyi.common.exception.BaseException;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysUserService;
@@ -26,6 +26,9 @@
@Autowired
private ISysUserService userService;
+
+ @Autowired
+ private SysPasswordService passwordService;
@Autowired
private SysPermissionService permissionService;
@@ -37,24 +40,26 @@
if (StringUtils.isNull(user))
{
log.info("登录用户：{} 不存在.", username);
- throw new UsernameNotFoundException("登录用户：" + username + " 不存在");
+ throw new ServiceException("登录用户：" + username + " 不存在");
}
else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
log.info("登录用户：{} 已被删除.", username);
- throw new BaseException("对不起，您的账号：" + username + " 已被删除");
+ throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
}
else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
{
log.info("登录用户：{} 已被停用.", username);
- throw new BaseException("对不起，您的账号：" + username + " 已停用");
+ throw new ServiceException("对不起，您的账号：" + username + " 已停用");
}
+
+ passwordService.validate(user);
return createLoginUser(user);
}
public UserDetails createLoginUser(SysUser user)
{
- return new LoginUser(user, permissionService.getMenuPermission(user));
+ return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
}
}
--
Gitblit v1.9.2