From b1bef8fac3c0553f87b7047673123b23b68daa49 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 十二月 2024 11:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4

---
 src/main/java/com/mzl/flower/web/login/SupplierLoginController.java |    5 +----
 1 files changed, 1 insertions(+), 4 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 2384912..44e0d1d 100644
--- a/src/main/java/com/mzl/flower/web/login/SupplierLoginController.java
+++ b/src/main/java/com/mzl/flower/web/login/SupplierLoginController.java
@@ -135,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