条件保存修改

jyBXSubscribe/rpc/internal/logic/bypushhistorylogic.go

@@ -69,6 +69,7 @@ func (l *ByPushHistoryLogic) ByPushHistory(in *bxsubscribe.SubscribeInfosReq) (*
 		PositionType:     in.PositionType,
 		NotReturnCount:   in.NotReturnCount,
 		Item:             in.Item,
+		District:         in.District,
 	}
 	//主体处理(fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户)
 	if in.UserType == model.MemberFlag || in.UserType == model.SubVipFlag || in.UserType == model.SubFreeFlag {

jyBXSubscribe/rpc/model/staffSubscribe.go

@@ -280,7 +280,6 @@ func GetStaffSubscribeDetail(entId, uid int64, token string) (rData map[string]i
 			valueVipMember = data
 		}
 	}
-
 	if len(valueEntNiche) > 0 && len(valueVipMember) > 0 {
 		rData[nameEntNiche] = valueEntNiche
 		rData[nameVipMember] = valueVipMember
@@ -364,7 +363,7 @@ func getPersonSubscribe(query map[string]interface{}) (rData map[string]interfac
 // getEntDistribute 获取企业分发订阅
 func getEntDistribute(ruleId string, entId, uid int64) (rData map[string]interface{}) {
 	//查询分发内容
-	ruleRes, _ := IC.Mgo.FindById("entniche_distribute", ruleId, `{"i_deptid":1,"o_area":1,"a_buyerclass":1,"a_items":1}`)
+	ruleRes, _ := IC.Mgo.FindById("entniche_distribute", ruleId, `{"o_district":1,i_deptid":1,"o_area":1,"a_buyerclass":1,"a_items":1}`)
 	if ruleRes == nil || len(*ruleRes) == 0 {
 		return
 	}