|
@@ -3,6 +3,7 @@ package logic
|
|
import (
|
|
import (
|
|
"app.yhyue.com/moapp/jybase/common"
|
|
"app.yhyue.com/moapp/jybase/common"
|
|
"context"
|
|
"context"
|
|
|
|
+ "github.com/gogf/gf/v2/util/gconv"
|
|
"jyBXSubscribe/rpc/type/bxsubscribe"
|
|
"jyBXSubscribe/rpc/type/bxsubscribe"
|
|
"strings"
|
|
"strings"
|
|
|
|
|
|
@@ -36,10 +37,13 @@ func (l *ByPushHistoryLogic) ByPushHistory(req *types.SubscribeReq) (resp *types
|
|
matchkeys := ""
|
|
matchkeys := ""
|
|
if req.IsEnt {
|
|
if req.IsEnt {
|
|
for k, v := range req.Item {
|
|
for k, v := range req.Item {
|
|
- if common.InterfaceToStr(v) == "" {
|
|
|
|
|
|
+ keyArr := gconv.Strings(v)
|
|
|
|
+ if len(keyArr) == 0 {
|
|
matchitemsArr = append(matchitemsArr, common.InterfaceToStr(k))
|
|
matchitemsArr = append(matchitemsArr, common.InterfaceToStr(k))
|
|
} else {
|
|
} else {
|
|
- matchkeysArr = append(matchkeysArr, common.InterfaceToStr(v))
|
|
|
|
|
|
+ for _, s := range keyArr {
|
|
|
|
+ matchkeysArr = append(matchkeysArr, s)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if len(matchitemsArr) == 0 {
|
|
if len(matchitemsArr) == 0 {
|