Merge branch 'dev_v1.1.45_wh' of BaseService/jyMicroservices into feature/v1.1.45

jyBXSubscribe/rpc/model/push.go

@@ -1675,10 +1675,11 @@ func (s *subscribePush) GetUserInfo(spqp *SubPushQueryParam) (vc *ViewCondition)
 			}
 		}
 	default:
-		userMap, ok := IC.Mgo.FindById("user", spqp.UserId, `{"o_jy":1}`)
+		userMap, ok := IC.Mgo.FindById("user", spqp.UserId, `{"o_jy":1,"subpush_inactive":1}`)
 		if !ok || userMap == nil || len(*userMap) == 0 {
 			return &ViewCondition{}
 		}
+		spqp.SubPushInactive = common.IntAll((*userMap)["subpush_inactive"])
 		o_jy, _ := (*userMap)["o_jy"].(map[string]interface{})
 		if o_jy["a_key"] != nil {
 			tmpInfo.Items, _ = o_jy["a_key"].([]interface{})