From 32ba3f92ffa0a520fec7cd51dcd0ca2da2d199f9 Mon Sep 17 00:00:00 2001
From: nies <shuai.nie@estsh.com>
Date: Thu, 9 Jun 2022 14:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B1=E4=BA=8E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=97=E7=AC=A6=E9=9B=86=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=90=8D=E4=B8=8D=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
index fad0bf6..435cc6e 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
@@ -985,6 +985,10 @@ public class SysUserService implements ISysUserService {
     public SysUser validatePasswordByLoginNameAndReturnUser(String loginName, String password) {
         SysUser userDb = getSysUserByLoginName(loginName);
         ValidatorBean.checkNotNull(userDb, "不存在的用户信息");
+        //由于数据库的字符集不区分大小写,所以需要根据用户名查询出来后再次比对
+        if (!userDb.getUserLoginName().equals(loginName)){
+            throw new IncorrectCredentialsException("用户名或密码错误");
+        }
         if (userDb.getUserLoginPasswordId() == null || userDb.getUserLoginPasswordId() <= 0) {
             if (!userDb.getUserLoginPassword().equals(SysUserPasswordUtil.encoder(password))) {
                 throw new IncorrectCredentialsException("用户密码错误");