From 36643a3a6c30bdb280568934a69607173a1f3e1a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 29 十二月 2024 14:56:13 +0800
Subject: [PATCH] 1.腾讯地图：定时任务每天凌晨5点
---
src/main/java/com/mzl/flower/service/system/UserService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/system/UserService.java b/src/main/java/com/mzl/flower/service/system/UserService.java
index 92bf94e..6721d3c 100644
--- a/src/main/java/com/mzl/flower/service/system/UserService.java
+++ b/src/main/java/com/mzl/flower/service/system/UserService.java
@@ -225,9 +225,19 @@
}
}else if(Constants.USER_TYPE.supplier.name().equals(user.getType())){
result.setSupplierDTO(supplierService.getCurrentSupplier());
+ //子账号信息
SupplierSub sub = supplierSubMapper.getCurrentSupplier(SecurityUtils.getUserId());
+ //主账号信息
SupplierDTO dto = supplierMapper.getCurrentSupplier(SecurityUtils.getUserId());
- String tempUserId = globalSupplierVariables.getSupplier(String.valueOf(dto.getId()));
+// if (!ObjectUtils.isEmpty(dto)) {
+// globalSupplierVariables.removeSupplier(String.valueOf(dto.getId()));
+// }
+ String tempUserId = "";
+ if (!ObjectUtils.isEmpty(sub)) {
+ tempUserId = globalSupplierVariables.getSupplier(String.valueOf(sub.getId()));
+ } else {
+ tempUserId = globalSupplierVariables.getSupplier(String.valueOf(dto.getId()));
+ }
if (!ObjectUtils.isEmpty(sub)) {
result.setIsSubSupplier(true);
result.setSupplierSub(sub);
--
Gitblit v1.9.3