feat:最新招标信息 字段异常处理

jyBXBase/rpc/model/newestBidding.go

@@ -28,7 +28,7 @@ const (
 
 func GetPushHistory(userId string) (res []*bxbase.NewestList) {
 	findSQL := "select infoid,matchkeys,attachment_count,budget,bidamount from pushsubscribe where userid = '" + userId + "'  and date >= %d order by id desc limit 50"
-	list := IC.PushMysql.SelectBySql(fmt.Sprintf(findSQL, time.Now().AddDate(-1, 0, -7).Unix()))
+	list := IC.PushMysql.SelectBySql(fmt.Sprintf(findSQL, time.Now().AddDate(0, 0, -7).Unix()))
 	if len(*list) > 0 {
 		m := map[string]bool{}
 		es_ids := []string{}
@@ -56,8 +56,8 @@ func GetPushHistory(userId string) (res []*bxbase.NewestList) {
 					_id := MC.ObjToString(v["_id"])
 					bn := infos[_id]
 					bn.Title = MC.ObjToString(v["title"])
-					bn.Subtype = MC.If(v["subtype"] != nil, v["subtype"], v["toptype"]).(string)
-					bn.Area = MC.If(MC.ObjToString(v["area"]) == "A", "全国", v["area"]).(string)
+					bn.Subtype = MC.If(v["subtype"] != nil, MC.ObjToString(v["subtype"]), MC.ObjToString(v["toptype"])).(string)
+					bn.Area = MC.If(MC.ObjToString(v["area"]) == "A", "全国", MC.ObjToString(v["area"])).(string)
 					bn.Buyerclass = MC.ObjToString(v["buyerclass"])
 					bn.City = MC.ObjToString(v["city"])
 					bn.Industry = MC.If(MC.ObjToString(v["s_subscopeclass"]) != "", strings.Split(strings.Split(MC.ObjToString(v["s_subscopeclass"]), ",")[0], "_")[0], "").(string)
@@ -79,8 +79,8 @@ func GetPushHistory(userId string) (res []*bxbase.NewestList) {
 					_id := mongodb.BsonIdToSId(v["_id"])
 					bn := infos[_id]
 					bn.Title = MC.ObjToString(v["title"])
-					bn.Subtype = MC.If(v["subtype"] != nil, v["subtype"], v["toptype"]).(string)
-					bn.Area = MC.If(MC.ObjToString(v["area"]) == "A", "全国", v["area"]).(string)
+					bn.Subtype = MC.If(v["subtype"] != nil, MC.ObjToString(v["subtype"]), MC.ObjToString(v["toptype"])).(string)
+					bn.Area = MC.If(MC.ObjToString(v["area"]) == "A", "全国", MC.ObjToString(v["area"])).(string)
 					bn.Buyerclass = MC.ObjToString(v["buyerclass"])
 					bn.City = MC.ObjToString(v["city"])
 					bn.Industry = MC.If(MC.ObjToString(v["s_subscopeclass"]) != "", strings.Split(strings.Split(MC.ObjToString(v["s_subscopeclass"]), ",")[0], "_")[0], "").(string)
@@ -101,8 +101,8 @@ func GetPushHistory(userId string) (res []*bxbase.NewestList) {
 					_id := mongodb.BsonIdToSId(v["_id"])
 					bn := infos[_id]
 					bn.Title = MC.ObjToString(v["title"])
-					bn.Subtype = MC.If(v["subtype"] != nil, v["subtype"], v["toptype"]).(string)
-					bn.Area = MC.If(MC.ObjToString(v["area"]) == "A", "全国", v["area"]).(string)
+					bn.Subtype = MC.If(v["subtype"] != nil, MC.ObjToString(v["subtype"]), MC.ObjToString(v["toptype"])).(string)
+					bn.Area = MC.If(MC.ObjToString(v["area"]) == "A", "全国", MC.ObjToString(v["area"])).(string)
 					bn.Buyerclass = MC.ObjToString(v["buyerclass"])
 					bn.City = MC.ObjToString(v["city"])
 					bn.Industry = MC.If(MC.ObjToString(v["s_subscopeclass"]) != "", strings.Split(strings.Split(MC.ObjToString(v["s_subscopeclass"]), ",")[0], "_")[0], "").(string)