Merge branch 'dev/v1.1.21_wh' of BaseService/jyMicroservices into feature/v1.1.21

jyBXSubscribe/api/internal/logic/byPushHistoryLogic.go

@@ -34,7 +34,7 @@ func (l *ByPushHistoryLogic) ByPushHistory(req *types.SubscribeReq) (resp *types
 	//关键词
 	matchkeysArr := []string{}
 	matchkeys := ""
-	if req.PositionType == 0 {
+	if req.IsEnt {
 		for k, v := range req.Item {
 			if common.InterfaceToStr(v) == "" {
 				matchitemsArr = append(matchitemsArr, common.InterfaceToStr(k))

jyBXSubscribe/api/internal/logic/subscribeListLogic.go

@@ -36,7 +36,7 @@ func (l *SubscribeListLogic) SubscribeList(req *types.SubscribeReq) (resp *types
 	//关键词
 	matchkeysArr := []string{}
 	matchkeys := ""
-	if req.PositionType == 0 {
+	if req.IsEnt {
 		for k, v := range req.Item {
 			if common.InterfaceToStr(v) == "" {
 				matchitemsArr = append(matchitemsArr, common.InterfaceToStr(k))