diff --git a/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java b/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java
index 8799be6..749bca6 100644
--- a/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java
+++ b/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java
@@ -25,6 +25,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 @Component
@@ -252,6 +253,9 @@ public class PasswordValidatorService {
      */
     public void validateUserResult(String username, R<LoginUser> userResult) {
         if (userResult == null || userResult.getData() == null || R.FAIL == userResult.getCode()) {
+            if (Objects.nonNull(userResult)) {
+                logAndThrowError(username, userResult.getMsg(), userResult.getMsg());
+            }
             logAndThrowError(username, "用户名/密码错误", "登录用户不存在");
         }
     }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
index 2af6812..b974f07 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
@@ -142,7 +142,6 @@ public class SysUserController extends BaseController {
         }
         SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId());
         if (StringUtils.isNull(sysDept)) {
-            logger.error("用户所在公司停用或注销");
             return R.fail("用户所在公司停用或注销");
         }
         // 角色集合
@@ -169,7 +168,6 @@ public class SysUserController extends BaseController {
         }
         SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId());
         if (StringUtils.isNull(sysDept)) {
-            logger.error("用户所在公司停用或注销");
             return R.fail("用户所在公司停用或注销");
         }
         // 角色集合
@@ -195,7 +193,6 @@ public class SysUserController extends BaseController {
         }
         SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId());
         if (StringUtils.isNull(sysDept)) {
-            logger.error("用户所在公司停用或注销");
             return R.fail("用户所在公司停用或注销");
         }
         // 角色集合