From 1c9f710b45c7554b4d22235db7db68cf29c8b60c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 3 Feb 2021 10:30:50 +0800
Subject: [PATCH] aa

---
 business/jxstore/permission/permission.go | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/permission/permission.go b/business/jxstore/permission/permission.go
index 87080377c..6cc5f6be5 100644
--- a/business/jxstore/permission/permission.go
+++ b/business/jxstore/permission/permission.go
@@ -370,18 +370,14 @@ func GetUserStoresResultMap(userID string) (resultMap map[int]int, err error) {
 	for k, _ := range storeIDMap {
 		storeIDs = append(storeIDs, k)
 	}
-	if brandIDMap[0] != 0 {
-		if cityCodeMap[0] != 0 {
-			stores, err = dao.GetStoreList(db, nil, nil, nil, nil, nil, "")
-		} else {
-			stores, err = dao.GetStoreList(db, storeIDs, cityCodes, nil, nil, nil, "")
-		}
-	} else {
-		if cityCodeMap[0] != 0 {
-			stores, err = dao.GetStoreList(db, nil, nil, nil, brandIDs, nil, "")
-		} else {
-			stores, err = dao.GetStoreList(db, storeIDs, cityCodes, nil, brandIDs, nil, "")
-		}
+	if stores1, err := dao.GetStoreList(db, nil, nil, brandIDs, nil, nil, ""); len(stores1) > 0 && err == nil {
+		stores = append(stores, stores1...)
+	}
+	if stores2, err := dao.GetStoreList(db, nil, cityCodes, nil, nil, nil, ""); len(stores2) > 0 && err == nil {
+		stores = append(stores, stores2...)
+	}
+	if stores3, err := dao.GetStoreList(db, storeIDs, nil, nil, nil, nil, ""); len(stores3) > 0 && err == nil {
+		stores = append(stores, stores3...)
 	}
 
 	for _, v := range stores {