From 375cc20507dbacaad684f539362d8eee7c7ec205 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期二, 24 九月 2024 20:19:05 +0800
Subject: [PATCH] 供应商的结算明细
---
src/main/java/com/mzl/flower/web/login/SupplierLoginController.java | 12 ++++++++----
1 files changed, 8 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 0fd20e3..2384912 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());
@@ -137,6 +134,13 @@
if(user == null){
throw new ValidationException("用户不存在");
}
+ SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(user.getId());
+ if (ObjectUtils.isEmpty(supplierDTO)) {
+ throw new ValidationException("用户不存在");
+ }
+ if (supplierDTO.getIsEnabled() == false) {
+ throw new ValidationException("用户已禁用，请联系管理员");
+ }
String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
if (StringUtils.isNotBlank(tokenCache)) {
//强制删除token，下线
--
Gitblit v1.9.3