数据查询修改

jyBXSubscribe/rpc/model/push.go

@@ -366,22 +366,10 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 		if spqp.IsEnt {
 			if spqp.BuySubject == 1 {
 				//企业主体是企业的企业查询
-				if spqp.UserType == SubVipFlag {
-					userStr = fmt.Sprintf("   a.entid='%s' and (a.source > 1) and (a.product=1) ", spqp.EntId)
-
-				} else if spqp.UserType == MemberFlag {
-					userStr = fmt.Sprintf("   a.entid='%s' and (a.source>1) and (a.product=2) ", spqp.EntId)
-
-				} else {
-					userStr = fmt.Sprintf("   a.entid='%s' and (a.source>1) and (a.product<1) ", spqp.EntId)
-				}
+				userStr = fmt.Sprintf("   a.entid='%s' and (a.source > 1) ", spqp.EntId)
 			} else {
 				//企业主体是个人的企业查询
-				if s.ModuleFlag == EntnicheFlag {
-					userStr = fmt.Sprintf("   a.entid='%s'  and a.product < 1", spqp.EntId)
-				} else {
-					userStr = fmt.Sprintf("   a.entid='%s'", spqp.EntId)
-				}
+				userStr = fmt.Sprintf("   a.entid='%s' ", spqp.EntId)
 			}
 		} else {
 			if spqp.BuySubject == 1 {