Merge branch 'dev/1.1.31_rjj' of BaseService/jyMicroservices into feature/v1.1.31

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -148,6 +148,10 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 	if fool {
 		pushSet["o_msg_privateletter"] = o_msg_privateletter
 	}
+	fool, o_msg_business := pushSetMontage(o_pushset["o_msg_business"], "o_msg_business", powerData, ShowWx)
+	if fool {
+		pushSet["o_msg_business"] = o_msg_business
+	}
 	return pushSet
 }
 func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx bool) (bool, *bxsubscribe.PushSet) {
@@ -312,7 +316,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":
+	case "o_msg_active", "o_msg_service", "o_msg_jyschool", "o_msg_privateletter", "o_msg_business":
 		isReturnMailShow = false
 		log.Println("data", data)
 		if data == nil || len(*data) == 0 {