From d9e918ae32613a04de0b979078eba278556979c5 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期四, 26 九月 2024 17:36:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
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