From 26a39dabb51f15b693d1b461082b9ba31c7a3cbc Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 15 十月 2024 16:06:38 +0800
Subject: [PATCH] 1

---
 src/main/java/com/mzl/flower/web/login/SupplierLoginController.java |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/login/SupplierLoginController.java b/src/main/java/com/mzl/flower/web/login/SupplierLoginController.java
index 78f19de..44e0d1d 100644
--- a/src/main/java/com/mzl/flower/web/login/SupplierLoginController.java
+++ b/src/main/java/com/mzl/flower/web/login/SupplierLoginController.java
@@ -88,10 +88,7 @@
             throw new ValidationException("用户不存在");
         }
         SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(user.getId());
-        if (ObjectUtils.isEmpty(supplierDTO)) {
-            throw new ValidationException("用户不存在");
-        }
-        if (supplierDTO.getIsEnabled() == false) {
+        if (supplierDTO != null && supplierDTO.getIsEnabled() == false) {
             throw new ValidationException("用户已禁用,请联系管理员");
         }
         String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
@@ -138,10 +135,7 @@
             throw new ValidationException("用户不存在");
         }
         SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(user.getId());
-        if (ObjectUtils.isEmpty(supplierDTO)) {
-            throw new ValidationException("用户不存在");
-        }
-        if (supplierDTO.getIsEnabled() == false) {
+        if (supplierDTO != null && supplierDTO.getIsEnabled() == false) {
             throw new ValidationException("用户已禁用,请联系管理员");
         }
         String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());

--
Gitblit v1.9.3