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

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -135,7 +135,6 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 	if fool {
 		pushSet["o_msg_active"] = o_msg_active
 	}
-	log.Println("-----", o_pushset["o_msg_service"])
 	fool, o_msg_service := pushSetMontage(o_pushset["o_msg_service"], "o_msg_service", powerData, ShowWx)
 	if fool {
 		pushSet["o_msg_service"] = o_msg_service
@@ -144,14 +143,14 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 	if fool {
 		pushSet["o_msg_jyschool"] = o_msg_jyschool
 	}
-	fool, o_msg_privateletter := pushSetMontage(o_pushset["o_msg_privateletter"], "o_msg_privateletter", powerData, ShowWx)
-	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
 	}
+	fool, o_msg_privateletter := pushSetMontage(o_pushset["o_msg_privateletter"], "o_msg_privateletter", powerData, ShowWx)
+	if fool {
+		pushSet["o_msg_privateletter"] = o_msg_privateletter
+	}
 	return pushSet
 }
 func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx bool) (bool, *bxsubscribe.PushSet) {