Browse Source

wip:bidding表

wangshan 1 year ago
parent
commit
4f815e77f6
1 changed files with 7 additions and 10 deletions
  1. 7 10
      src/jfw/modules/publicapply/src/userbase/entity/entity.go

+ 7 - 10
src/jfw/modules/publicapply/src/userbase/entity/entity.go

@@ -4,7 +4,6 @@ import (
 	"app.yhyue.com/moapp/jybase/date"
 	"encoding/json"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
 	"jy/src/jfw/modules/publicapply/src/config"
 	"jy/src/jfw/modules/publicapply/src/db"
 	"jy/src/jfw/modules/publicapply/src/userbase/initjson"
@@ -594,16 +593,14 @@ func (o *OriginalPower) CNode() (leadOk bool) {
 // GetOriginalTextUrl 获取原文地址
 func GetOriginalTextUrl(biddingId string) (href string) {
 	obj := map[string]interface{}{}
-	brobj, ok := db.Mgo.Find("bidding_rec", bson.M{"s_id": biddingId}, `{"l_recoverydate":-1}`, nil, false, 0, 1)
-	if ok && (*brobj) != nil && len(*brobj) == 1 && (*brobj)[0] != nil {
-		obj = (*brobj)[0]
-	} else {
-		aobj, ok := db.Mgo_Bidding.FindById(db.DbConf.Mongodb.Bidding.Collection, biddingId, nil)
-		if ok && (aobj == nil || *aobj == nil || len(*aobj) == 0) {
-			aobj, ok = db.Mgo_Bidding.FindById(db.DbConf.Mongodb.Bidding.Collection_change, biddingId, nil)
-		}
-		obj = *aobj
+	aobj, ok := db.Mgo_Bidding.FindById(db.DbConf.Mongodb.Bidding.Collection, biddingId, nil)
+	if ok && (aobj == nil || *aobj == nil || len(*aobj) == 0) {
+		aobj, ok = db.Mgo_Bidding.FindById(db.DbConf.Mongodb.Bidding.Collection_change, biddingId, nil)
+	}
+	if aobj == nil {
+		return
 	}
+	obj = *aobj
 	if obj != nil && len(obj) > 0 {
 		infoformat := util.IntAllDef(obj["infoformat"], 1)
 		obj["infoformat"] = infoformat