From f80c6068d5e2ae5b9101125497b4de88726e1d9e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 07 四月 2024 21:44:58 +0800
Subject: [PATCH] 发货接口增加仓库ID

---
 service/lru.go |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/service/lru.go b/service/lru.go
index 5a8f73d..888aba5 100644
--- a/service/lru.go
+++ b/service/lru.go
@@ -16,21 +16,27 @@
 
 func init() {
 	//make cache with 5 minutes TTL and 100 max keys
-	userCache = expirable.NewLRU[string, *UserBaseInfo](100, nil, time.Minute*5)
+	userCache = expirable.NewLRU[string, *UserBaseInfo](100, nil, time.Minute*1) //todo zq 鏆傛椂鏀规垚 1鍒嗛挓
 }
 
 func GetUserBaseCache(adminUserId string) *UserBaseInfo {
-	userCache, ok := userCache.Get(adminUserId)
+	cache, ok := userCache.Get(adminUserId)
 	if !ok {
 		userService := UserService{}
 		userRecord, err := userService.GetUserInfo(adminUserId)
 		if err != nil {
 			return nil
 		}
-		subIds, _, err := userService.UUID2CrmUserId(strings.Split(userRecord.SubUserIds, ","))
-		if err != nil {
-			return nil
+		var subIds []int
+		if userRecord.SubUserIds != "" {
+			subIds, _, err = userService.UUID2CrmUserId(strings.Split(userRecord.SubUserIds, ","))
+			if err != nil {
+				return nil
+			}
 		}
+
+		subIds = append(subIds, userRecord.ID)
+
 		baseInfo := &UserBaseInfo{
 			UserId:     userRecord.ID,
 			NickName:   userRecord.NickName,
@@ -39,7 +45,7 @@
 		SetUserBaseCache(adminUserId, baseInfo)
 		return baseInfo
 	}
-	return userCache
+	return cache
 }
 
 func SetUserBaseCache(adminUserId string, user *UserBaseInfo) {

--
Gitblit v1.8.0