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

jyBXSubscribe/rpc/model/push.go

@@ -593,7 +593,9 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 			} else {
 				//查询分配人员或是否已读
 				staffQuery := " 1=1 "
-				if len(staffs) > 0 {
+				if len(spqp.Staffs) > 0 {
+					staffQuery += fmt.Sprintf(" and  a.userid in ('%s')  ", strings.Join(staffs, "','"))
+				} else {
 					staffQuery += fmt.Sprintf(" and  a.userid in (0,'%s')  ", strings.Join(staffs, "','"))
 				}
 				if spqp.IsRead != "" {