From 4537f8e46508fbe3627fe916ada90ebc7d281a7e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 12 十一月 2024 17:25:00 +0800
Subject: [PATCH] add:553-结算列表增加导出表格功能
---
src/main/java/com/mzl/flower/web/login/SupplierLoginController.java | 9 +++++----
1 files changed, 5 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..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());
@@ -137,6 +134,10 @@
if(user == null){
throw new ValidationException("用户不存在");
}
+ SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(user.getId());
+ if (supplierDTO != null && supplierDTO.getIsEnabled() == false) {
+ throw new ValidationException("用户已禁用，请联系管理员");
+ }
String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
if (StringUtils.isNotBlank(tokenCache)) {
//强制删除token，下线
--
Gitblit v1.9.3