From 893163661988d02c9a70302634bd57dffd2cd308 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 14 Dec 2022 14:17:07 +0800
Subject: [PATCH] bug63687

---
 .../main/java/com/adc/da/login/rest/LoginRestController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
index bb8e2292..0f93f85a 100644
--- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
+++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
@@ -63,11 +63,11 @@ public class LoginRestController {
                                              @RequestParam @NotNull(message = "请输入密码") String password,
                                              @RequestParam(value = "isRememberMe", defaultValue = "false") Boolean isRememberMe, String verifyCode) throws UnsupportedEncodingException {
         UserEO userEO = userService.getUserByLoginNameNotDeleted(username);
-        userEO.setInstitutionNameDepartment(userService.getName(userEO.getInstitutionId()));
         if (null == userEO) {
             log.info("用户[{}]身份验证失败", username);
             return Result.error("r0011", "您输入的帐号或密码有误");
         }
+        userEO.setInstitutionNameDepartment(userService.getName(userEO.getInstitutionId()));
         if(userEO.getDisableFlag()==1){
             log.info("用户[{}]身份验证失败", username);
             return Result.error("r0011", "您输入的帐号已禁用");