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

jyBXSubscribe/rpc/model/push.go

@@ -499,18 +499,18 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 		if spqp.IsEnt {
 			if spqp.Key != "" {
 				for _, v := range strings.Split(spqp.Key, ",") {
-					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchkeys,'+',','),' ',','))", v))
+					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(a.matchkeys,' ',','))", v))
 				}
 			}
 			if spqp.Item != "" {
 				for _, v := range strings.Split(spqp.Item, ",") {
-					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchitems,'+',','),' ',','))", v))
+					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(a.matchitems,' ',','))", v))
 				}
 			}
 		} else {
 			if spqp.Key != "" {
 				for _, v := range strings.Split(spqp.Key, ",") {
-					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(replace(a.matchkeys,'+',','),' ',','))", v))
+					find_in_set = append(find_in_set, fmt.Sprintf("find_in_set('%s',replace(a.matchkeys,' ',','))", v))
 				}
 			}
 		}