代码修改

src/jfw/modules/bigmember/src/service/report/report.go

@@ -109,14 +109,13 @@ func (r *Report) Index() {
 	positionType := qutil.Int64All(r.GetSession("positionType"))
 	o_mb := &map[string]interface{}{}
 	if positionType == 0 {
-		data := jy.GetBigVipUserBaseMsg( r.Session(), *config.Middleground)
+		data := jy.GetBigVipUserBaseMsg(r.Session(), *config.Middleground)
 		if data.Data.Member.Pid == "" {
 			//没有父级
 			o_mb := jy.GetSubScribeInfo(r.Session(), Mgo, "m", "10000")
 			if o_mb != nil && (*o_mb)["o_member_jy"] != nil {
 				(*o_mb)["o_member_jy"] = o_mb
 			}
-
 		} else {
 			o_mb, ok = Mgo.FindById(C_User, userId, `{"o_member_jy":1,"s_member_mainid":1,"i_member_sub_status":1}`)
 			if ok && o_mb != nil && (*o_mb) != nil && (*o_mb)["s_member_mainid"] != nil && qutil.IntAllDef((*o_mb)["i_member_sub_status"], 0) == 1 { //如果是子账号 查询主账号信息
@@ -586,7 +585,7 @@ func getColl(referer, t string) (string, string) {
 	}
 }
 func isFree(userId string, positionType int64, session *httpsession.Session) bool {
-	bigVipBaseMsg := jy.GetBigVipUserBaseMsg( session, *config.Middleground)
+	bigVipBaseMsg := jy.GetBigVipUserBaseMsg(session, *config.Middleground)
 	if bigVipBaseMsg == nil {
 		return true
 	} else if bigVipBaseMsg.Data.Vip.Status <= 0 && bigVipBaseMsg.Data.Member.Status <= 0 {

src/jfw/modules/bigmember/src/service/use/use.go

@@ -546,7 +546,6 @@ func (u *Use) Equity() {
 				o_member_jy, _ = db.Mgo.FindOneByField("user", map[string]interface{}{
 					"_id": mongodb.StringTOBsonId(userid),
 				}, `{"o_member_jy":1}`)
-
 				if o_member_jy != nil && len(*o_member_jy) > 0 {
 					(*person)["o_member_jy"] = o_member_jy
 				}

src/jfw/modules/publicapply/src/dataexport/entity/collection.go

@@ -10,7 +10,6 @@ func IsPay(session *httpsession.Session) bool {
 	isVip, isMember, isEnt := false, false, false
 	data := jy.GetBigVipUserBaseMsg(session, *config.Middleground)
 	isVip = data.Data.Vip.Status > 0
-	isEnt = data.Data.Entniche.Status > 0
 	if data.Data.Entniche.Status == 1 && data.Data.Entniche.IsEntPower == 1 && data.Data.Entniche.IsNew == 1 {
 		isEnt = true
 	}

src/jfw/modules/publicapply/src/subscribePush/entity/historyPush.go

@@ -202,7 +202,6 @@ func (d *defaultPush) getDefaultDatasSQL(scd *ViewCondition) (str string) {
 	query_bool_should := `{"bool":{"should":[%s],"minimum_should_match": 1}}`
 	multi_match := `{"multi_match": {"query": %s,"type": "phrase", "fields": [%s]}}`
 	query_bool_must_and := `{"bool":{"must":[%s]%s}}`
-
 	bools := []string{}
 	musts := []string{}
 	//发布时间最新7天