Merge remote-tracking branch 'base-version/test' into dev

This commit is contained in:
chenbowen
2026-01-20 11:19:23 +08:00

View File

@@ -110,6 +110,9 @@ public class AdminAuthServiceImpl implements AdminAuthService {
final LoginLogTypeEnum logTypeEnum = LoginLogTypeEnum.LOGIN_USERNAME; final LoginLogTypeEnum logTypeEnum = LoginLogTypeEnum.LOGIN_USERNAME;
// 校验账号是否存在 // 校验账号是否存在
AdminUserDO user = userService.getUserByUsername(username); AdminUserDO user = userService.getUserByUsername(username);
if (user == null) {
user = userService.getUserByWorkcode(username);
}
if (user == null) { if (user == null) {
createLoginLog(null, username, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS); createLoginLog(null, username, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);
throw exception(AUTH_LOGIN_BAD_CREDENTIALS); throw exception(AUTH_LOGIN_BAD_CREDENTIALS);