Merge branch 'master' into feature/v1.1.38

jyBXSubscribe/api/bxsubscribe.api

@@ -225,6 +225,6 @@ service bxsubscribe-api {
 	post /jybx/subscribe/getStaffSubscribe (GetStaffSubscribeListReq) returns (StaffSubscribeCommonResp)
 	@handler getStaffSubscribeDetail //查询企业员工订阅详情
 	post /jybx/subscribe/getStaffSubscribeDetail (GetStaffSubscribeDetailReq) returns (StaffSubscribeCommonResp)
-	@handler bidDistributor   //标讯分发
+	@handler bidDistributor  //标讯分发
 	post /jybx/subscribe/bidDistributor(BidDistributor) returns (commonResp)
 }

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -107,6 +107,7 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 	if fool {
 		pushSet["o_subset"] = o_subset
 	}
+
 	fool, o_week_report := pushSetMontage(o_pushset["o_week_report"], "o_week_report", powerData, ShowWx)
 	if fool {
 		pushSet["o_week_report"] = o_week_report
@@ -154,6 +155,10 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 		pushSet["o_msg_business"] = o_msg_business
 	}
 	//私信
+	fool, o_msg_pending := pushSetMontage(o_msgPushSet["o_msg_pending"], "o_msg_business", powerData, ShowWx)
+	if fool {
+		pushSet["o_msg_pending"] = o_msg_pending
+	}
 	fool, o_msg_privateletter := pushSetMontage(o_msgPushSet["o_msg_privateletter"], "o_msg_privateletter", powerData, ShowWx)
 	if fool {
 		pushSet["o_msg_privateletter"] = o_msg_privateletter
@@ -325,7 +330,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 		} else {
 			return false, nil
 		}
-	case "o_msg_active", "o_msg_service", "o_msg_jyschool", "o_msg_privateletter", "o_msg_business":
+	case "o_msg_active", "o_msg_service", "o_msg_jyschool", "o_msg_privateletter", "o_msg_business", "o_msg_pending":
 		isReturnMailShow = false
 		var isWXShow int64
 		isWXShow = 1