liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改用户查询自己门店信息

Browse Source
This commit is contained in:
邹宗楠
2022-04-12 14:07:12 +08:00
parent 8fce1da313
commit 7e318ca948
2 changed files with 19 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
business/jxstore/cms/user2.go
View File

@@ -1243,15 +1243,26 @@ func UpdateUserLastInfo(ctx *jxcontext.Context, storeID, brandID int) (err error
}
func GetUserStoreAuth(ctx *jxcontext.Context, storeID int) (outStoreID int, err error) {
//if permission.IsRoled(ctx) {
storeMap, _ := permission.GetUserStoresResultMap(ctx.GetUserID())
if storeMap[storeID] != 0 {
return storeID, err
} else {
if permission.IsRoled(ctx) {
configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "")
storeMaps, _, err := GetMyStoreListNew(ctx, configs[0].Value)
if err != nil {
return 0, err
}
//}
//return storeID, err
for _, v := range storeMaps.([]map[string]interface{}) {
if v["id"].(int) != storeID {
continue
}
return storeID, nil
}
//storeMap, _ := permission.GetUserStoresResultMap(ctx.GetUserID())
//if storeMap[storeID] != 0 {
// return storeID, err
//} else {
// return 0, err
//}
}
return storeID, err
}
func SendQywxPeopleCount(ctx *jxcontext.Context) (err error) {

39
business/jxstore/permission/permission.go
View File

@@ -340,9 +340,6 @@ func UpdateRoleMenu(ctx *jxcontext.Context, roleIDs, menuIDs []int) (err error)
func GetUserStoresResultMap(userID string) (resultMap map[int]int, err error) {
var (
db = dao.GetDB()
// brandIDMap = make(map[int]int)
// cityCodeMap = make(map[int]int)
// storeIDMap = make(map[int]int)
)
resultMap = make(map[int]int)
user, _ := dao.GetUserByID(db, "user_id", userID)
@@ -360,23 +357,6 @@ func GetUserStoresResultMap(userID string) (resultMap map[int]int, err error) {
var (
brandIDs, cityCodes, storeIDs []int
)
// if _, ok := brandIDMap[v.BrandID]; !ok {
// brandIDMap[v.BrandID] = 1
// }
// if v.CityCodes != "" {
// for _, cityCode := range jxutils.StrListToIntList(strings.Split(v.CityCodes, ",")) {
// if _, ok := cityCodeMap[cityCode]; !ok {
// cityCodeMap[cityCode] = 1
// }
// }
// }
// if v.StoreIDs != "" {
// for _, storeID := range jxutils.StrListToIntList(strings.Split(v.StoreIDs, ",")) {
// if _, ok := storeIDMap[storeID]; !ok {
// storeIDMap[storeID] = 1
// }
// }
// }
if v.CityCodes == "" && v.StoreIDs == "" {
continue
}
@@ -395,24 +375,7 @@ func GetUserStoresResultMap(userID string) (resultMap map[int]int, err error) {
}
}
}
// for k, _ := range brandIDMap {
// brandIDs = append(brandIDs, k)
// }
// for k, _ := range cityCodeMap {
// cityCodes = append(cityCodes, k)
// }
// for k, _ := range storeIDMap {
// storeIDs = append(storeIDs, k)
// }
// 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...)
// }
return resultMap, err
}