bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

公司停用后登录提示改动

This commit is contained in:
sxu 2025-01-10 17:29:06 +08:00
parent b06a8e1f7a
commit 5dcf3cfc95
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java
View File

@ -25,6 +25,7 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@Component @Component
@ -252,6 +253,9 @@ public class PasswordValidatorService {
*/ */
public void validateUserResult(String username, R<LoginUser> userResult) { public void validateUserResult(String username, R<LoginUser> userResult) {
if (userResult == null || userResult.getData() == null || R.FAIL == userResult.getCode()) { if (userResult == null || userResult.getData() == null || R.FAIL == userResult.getCode()) {
if (Objects.nonNull(userResult)) {
logAndThrowError(username, userResult.getMsg(), userResult.getMsg());
}
logAndThrowError(username, "用户名/密码错误", "登录用户不存在"); logAndThrowError(username, "用户名/密码错误", "登录用户不存在");
} }
} }

3
bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
View File

@ -142,7 +142,6 @@ public class SysUserController extends BaseController {
} }
SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId()); SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId());
if (StringUtils.isNull(sysDept)) { if (StringUtils.isNull(sysDept)) {
logger.error("用户所在公司停用或注销");
return R.fail("用户所在公司停用或注销"); return R.fail("用户所在公司停用或注销");
} }
// 角色集合 // 角色集合
@ -169,7 +168,6 @@ public class SysUserController extends BaseController {
} }
SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId()); SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId());
if (StringUtils.isNull(sysDept)) { if (StringUtils.isNull(sysDept)) {
logger.error("用户所在公司停用或注销");
return R.fail("用户所在公司停用或注销"); return R.fail("用户所在公司停用或注销");
} }
// 角色集合 // 角色集合
@ -195,7 +193,6 @@ public class SysUserController extends BaseController {
} }
SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId()); SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId());
if (StringUtils.isNull(sysDept)) { if (StringUtils.isNull(sysDept)) {
logger.error("用户所在公司停用或注销");
return R.fail("用户所在公司停用或注销"); return R.fail("用户所在公司停用或注销");
} }
// 角色集合 // 角色集合