From b57577d31651e0782f96b5353d62d814f3b9002b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 28 Mar 2022 15:37:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/auth/server/AuthServer.java    | 5 +++++
 .../main/java/io/dataease/service/sys/SysUserService.java    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java
index 9bea8f4a0e..6a400910be 100644
--- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java
+++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java
@@ -91,6 +91,11 @@ public class AuthServer implements AuthApi {
 
         SysUserEntity user = authUserService.getUserByName(username);
 
+        // 验证登录类型是否与用户类型相同
+        if (!sysUserService.validateLoginType(user.getFrom(), loginType)) {
+            DataEaseException.throwException(Translator.get("i18n_id_or_pwd_error"));
+        }
+
         if (ObjectUtils.isEmpty(user)) {
             DataEaseException.throwException(Translator.get("i18n_id_or_pwd_error"));
         }
diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
index 2d77f5fb85..6038834457 100644
--- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java
+++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
@@ -156,6 +156,11 @@ public class SysUserService {
         });
     }
 
+    public boolean validateLoginType(Integer from, Integer loginType) {
+
+        return ObjectUtils.isNotEmpty(from) && ObjectUtils.isNotEmpty(loginType) && from == loginType;
+    }
+
     public List<String> ldapUserNames() {
 
         List<String> usernames = extSysUserMapper.ldapUserNames(1);