From 9f7906134e18cf0b4e14b4fb77faa57ccd40431e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 29 Feb 2024 09:38:09 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/store.go             | 20 +++++++++++---------
 business/jxstore/permission/permission.go | 10 ++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index d6196992c..eaa0e2cb6 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -588,18 +588,20 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
 					if storeIDsMap[int(utils.Interface2Int64WithDefault(params["storeID"], 0))] == 0 {
 						params["storeID"] = nil
 					}
-				} else {
-					if len(storeIDsMap) > 0 {
-						for k, _ := range storeIDsMap {
-							storeIDs2 = append(storeIDs2, k)
-						}
-					} else {
-						//storeIDs2 = append(storeIDs2, -1)l
-						// 商家小程序用户切换门店,如果角色storeIDsMap没有数据则查询传入数据
-						storeIDs2 = append(storeIDs2, int(utils.Interface2Int64WithDefault(params["storeID"], 0)))
+				} else if len(storeIDsMap) > 0 {
+					for k, _ := range storeIDsMap {
+						storeIDs2 = append(storeIDs2, k)
 					}
+				} else {
+					//storeIDs2 = append(storeIDs2, -1)l
+					// 商家小程序用户切换门店,如果角色storeIDsMap没有数据则查询传入数据
+					storeIDs2 = append(storeIDs2, int(utils.Interface2Int64WithDefault(params["storeID"], 0)))
 				}
 			}
+			roleInfo, _ := GetUserRoleList(ctx, ctx.GetUserID())
+			for _, v := range roleInfo {
+				storeIDs2 = append(storeIDs2, v.StoreID)
+			}
 			if data, err := json.Marshal(storeIDs2); err == nil {
 				params["storeIDs"] = string(data)
 			}
diff --git a/business/jxstore/permission/permission.go b/business/jxstore/permission/permission.go
index 04bea7b00..4a75bc4b2 100644
--- a/business/jxstore/permission/permission.go
+++ b/business/jxstore/permission/permission.go
@@ -343,13 +343,11 @@ func GetUserStoresResultMap(userID string) (resultMap map[int]int, err error) {
 	)
 	resultMap = make(map[int]int)
 	user, _ := dao.GetUserByID(db, "user_id", userID)
-	if user != nil {
-		if user.BindStoreID != "" {
-			for _, v := range strings.Split(user.BindStoreID, ",") {
-				resultMap[utils.Str2Int(v)] = utils.Str2Int(v)
-			}
-			return resultMap, err
+	if user != nil && user.BindStoreID != "" {
+		for _, v := range strings.Split(user.BindStoreID, ",") {
+			resultMap[utils.Str2Int(v)] = utils.Str2Int(v)
 		}
+		return resultMap, err
 	}
 	userRoles, err2 := dao.GetUserRole2(db, []string{userID}, nil)
 	err = err2