浏览代码

Merge branch 'dev/1.1.41_fuwencai' of BaseService/jyMicroservices into feature/v1.1.41

fuwencai 1 年之前
父节点
当前提交
0ccd240583
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      jyBXSubscribe/rpc/model/service/pushSet.go

+ 1 - 1
jyBXSubscribe/rpc/model/service/pushSet.go

@@ -228,7 +228,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 			returnData = &bxsubscribe.PushSet{
 				ATimes:    []string{"实时推送"},
 				IApppush:  common.Int64All(common.If((*data)["i_apppush"] == nil, 1, (*data)["i_apppush"])),
-				IWxpush:   common.Int64All(common.If(ShowWx, 1, 0)),
+				IWxpush:   common.Int64All(common.If((*data)["i_wxpush"] == nil, common.If(ShowWx, 1, 0), common.If(ShowWx, (*data)["i_wxpush"], 0))),
 				IMailpush: common.Int64All(common.If((*data)["i_mailpush"] == nil, 0, (*data)["i_mailpush"])),
 				IRatemode: 1,
 				IsWxShow:  1,