|
|
@@ -1061,10 +1061,10 @@ func (s *subscribePush) listManager(spqp *SubPushQueryParam, list []map[string]i
|
|
|
matchkey := strings.Join(matchkeys, " ")
|
|
|
subscopeclassStr := ""
|
|
|
area := common.If(v["area"] == nil, nil, common.If(common.ObjToString(v["area"]) == "A", 0, common.If(P.PushMapping.Area[common.ObjToString(v["area"])] > 0, P.PushMapping.Area[common.ObjToString(v["area"])], 0)))
|
|
|
- city := common.If(v["city"] == nil, nil, common.If(P.PushMapping.City[common.ObjToString(v["city"])] > 0, P.PushMapping.City[common.ObjToString(v["city"])], 0))
|
|
|
- subtype := common.If(v["subtype"] == nil, nil, common.If(P.PushMapping.Subtype[common.ObjToString(v["subtype"])] > 0, P.PushMapping.Subtype[common.ObjToString(v["subtype"])], 0))
|
|
|
- toptype := common.If(v["subtype"] == nil, nil, common.If(P.PushMapping.Toptype[common.ObjToString(v["toptype"])] > 0, P.PushMapping.Toptype[common.ObjToString(v["toptype"])], 0))
|
|
|
- buyerclass := common.If(v["buyerclass"] == nil, nil, common.If(P.PushMapping.Buyerclass[common.ObjToString(v["buyerclass"])] > 0, P.PushMapping.Buyerclass[common.ObjToString(v["buyerclass"])], 0))
|
|
|
+ city := common.If(P.PushMapping.City[common.ObjToString(v["city"])] == 0, nil, P.PushMapping.City[common.ObjToString(v["city"])])
|
|
|
+ subtype := common.If(P.PushMapping.Subtype[common.ObjToString(v["subtype"])] == 0, nil, P.PushMapping.Subtype[common.ObjToString(v["subtype"])])
|
|
|
+ toptype := common.If(P.PushMapping.Toptype[common.ObjToString(v["toptype"])] == 0, nil, P.PushMapping.Toptype[common.ObjToString(v["toptype"])])
|
|
|
+ buyerclass := common.If(P.PushMapping.Buyerclass[common.ObjToString(v["buyerclass"])] == 0, nil, P.PushMapping.Buyerclass[common.ObjToString(v["buyerclass"])])
|
|
|
attachment_count := 0
|
|
|
if v["isValidFile"] != nil {
|
|
|
isValidFile, _ := v["isValidFile"].(bool)
|
