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", "您输入的帐号已禁用");