Эх сурвалжийг харах

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

王浩 2 жил өмнө
parent
commit
bb9a92b1ef

+ 1 - 2
jyBXSubscribe/rpc/model/push.go

@@ -594,7 +594,7 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 				//查询分配人员或是否已读
 				staffQuery := " 1=1 "
 				if len(staffs) > 0 {
-					staffQuery += fmt.Sprintf(" and  a.userid in ('%s')  ", strings.Join(staffs, "','"))
+					staffQuery += fmt.Sprintf(" and  a.userid in (0,'%s')  ", strings.Join(staffs, "','"))
 				}
 				if spqp.IsRead != "" {
 					if spqp.IsRead == "0" {
@@ -704,7 +704,6 @@ func (s *subscribePush) GetInfoByIds(Mgo_bidding mongodb.MongodbSim, bidding, bi
 		}
 		m[v.InfoId] = true
 		ids = append(ids, v.InfoId)
-
 	}
 	infos := map[string]map[string]interface{}{}
 	//redis