diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index d888286b2..bb13a516c 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1511,6 +1511,25 @@ func TmpGetJxBadCommentsNo(ctx *jxcontext.Context, storeID int) (count int, err func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, keyword string, storeIDs []int, offset, pageSize, commentType int, fromTime, toTime time.Time) (retVal map[string]interface{}, err error) { db := dao.GetDB() + //权限 + if permission.IsRoled(ctx) { + if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { + var storeIDs2 []int + if len(storeIDs) > 0 { + for _, v := range storeIDs { + if storeIDsMap[v] != 0 { + storeIDs2 = append(storeIDs2, v) + } + } + } else { + for k, _ := range storeIDsMap { + storeIDs2 = append(storeIDs2, k) + } + } + storeIDs = nil + storeIDs = storeIDs2 + } + } sql := ` SELECT SQL_CALC_FOUND_ROWS t1.*, t2.name store_name, t3.name city_name, @@ -2783,6 +2802,25 @@ func StoreStatus2Chinese(status int) (str string) { func GetStorePriceScore(ctx *jxcontext.Context, storeIDs, vendorIDs []int, fromScore, toScore, sort int, snapDate string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { var snapDateParam time.Time db := dao.GetDB() + //权限 + if permission.IsRoled(ctx) { + if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { + var storeIDs2 []int + if len(storeIDs) > 0 { + for _, v := range storeIDs { + if storeIDsMap[v] != 0 { + storeIDs2 = append(storeIDs2, v) + } + } + } else { + for k, _ := range storeIDsMap { + storeIDs2 = append(storeIDs2, k) + } + } + storeIDs = nil + storeIDs = storeIDs2 + } + } if snapDate != "" { snapDateParam = utils.Str2Time(snapDate) } diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 9c1a2a863..dad4bc984 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -4741,6 +4741,25 @@ func GetStoreSkuAudit(ctx *jxcontext.Context, storeIDs, nameIDs, skuIDs, statuss if auditTimeEnd != "" { auditTimeEndp = utils.Str2Time(auditTimeEnd) } + //权限 + if permission.IsRoled(ctx) { + if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { + var storeIDs2 []int + if len(storeIDs) > 0 { + for _, v := range storeIDs { + if storeIDsMap[v] != 0 { + storeIDs2 = append(storeIDs2, v) + } + } + } else { + for k, _ := range storeIDsMap { + storeIDs2 = append(storeIDs2, k) + } + } + storeIDs = nil + storeIDs = storeIDs2 + } + } pagedInfo, err = dao.GetStoreSkuAudit(dao.GetDB(), storeIDs, nameIDs, skuIDs, statuss, types, name, remark, keyword, marketManPhone, cityName, applyTimeStartp, applyTimeEndp, auditTimeStartp, auditTimeEndp, pageSize, offset) return pagedInfo, err } diff --git a/business/jxstore/misc/store_score.go b/business/jxstore/misc/store_score.go index 90e3a24ce..0340dc879 100644 --- a/business/jxstore/misc/store_score.go +++ b/business/jxstore/misc/store_score.go @@ -11,6 +11,7 @@ import ( "git.rosy.net.cn/baseapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxstore/cms" + "git.rosy.net.cn/jx-callback/business/jxstore/permission" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" @@ -812,8 +813,27 @@ func GetWeeklyStoreScore(storeID, weekIndexParam int) (outWeeklyStoreScoreDataLi return outWeeklyStoreScoreDataList, err } -func GetStoreTotalScoreList(storeIDList []int, cityCode int, keyWord string, beginTime, endTime time.Time, isDesc bool, checkScoreLow, checkScoreHigh, offset, pageSize int) (storeTotalScoreEx model.StoreTotalScoreEx, err error) { +func GetStoreTotalScoreList(ctx *jxcontext.Context, storeIDList []int, cityCode int, keyWord string, beginTime, endTime time.Time, isDesc bool, checkScoreLow, checkScoreHigh, offset, pageSize int) (storeTotalScoreEx model.StoreTotalScoreEx, err error) { db := dao.GetDB() + //权限 + if permission.IsRoled(ctx) { + if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { + var storeIDs2 []int + if len(storeIDList) > 0 { + for _, v := range storeIDList { + if storeIDsMap[v] != 0 { + storeIDs2 = append(storeIDs2, v) + } + } + } else { + for k, _ := range storeIDsMap { + storeIDs2 = append(storeIDs2, k) + } + } + storeIDList = nil + storeIDList = storeIDs2 + } + } storeTotalScoreMapData := make(map[int]*model.StoreTotalScore) storeTotalScoreList, err := dao.GetStoreTotalScoreList(db, storeIDList, cityCode, keyWord, beginTime, endTime) var filterStoreTotalScoreList []*model.StoreTotalScore diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 1f76011b5..a94227602 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -490,7 +490,7 @@ func (c *StoreController) GetStoreTotalScoreList() { if err == nil { var storeIDList []int if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDList); err == nil { - retVal, err = misc.GetStoreTotalScoreList(storeIDList, params.CityCode, params.Keyword, timeList[0], timeList[1], params.IsDesc, params.CheckScoreLow, params.CheckScoreHigh, params.Offset, params.PageSize) + retVal, err = misc.GetStoreTotalScoreList(params.Ctx, storeIDList, params.CityCode, params.Keyword, timeList[0], timeList[1], params.IsDesc, params.CheckScoreLow, params.CheckScoreHigh, params.Offset, params.PageSize) } } return retVal, "", err