|
|
@@ -181,10 +181,15 @@ func infoFind(id string, v1 string) map[string]interface{} {
|
|
|
//ownerclass 业主类型(拟在建搜索) expurasing_time 预计采购时间 jybx_url 标讯详情页
|
|
|
//标讯信息
|
|
|
obj := map[string]interface{}{}
|
|
|
-
|
|
|
- aobj, ok := MC.MgoBidding.FindById("bidding", id, public.MgoBiddingFields)
|
|
|
- if ok && (aobj == nil || *aobj == nil || len(*aobj) == 0) {
|
|
|
- aobj, ok = MC.MgoBidding.FindById("bidding_back", id, public.MgoBiddingFields)
|
|
|
+ brobj, ok := MC.Mgo.Find("bidding_rec", bson.M{"s_id": id}, `{"l_recoverydate":-1}`, public.MgoBiddingFields, false, 0, 1)
|
|
|
+ if ok && (*brobj) != nil && len(*brobj) == 1 && (*brobj)[0] != nil {
|
|
|
+ obj = (*brobj)[0]
|
|
|
+ } else {
|
|
|
+ aobj, ok := MC.MgoBidding.FindById("bidding", id, public.MgoBiddingFields)
|
|
|
+ if ok && (aobj == nil || *aobj == nil || len(*aobj) == 0) {
|
|
|
+ aobj, ok = MC.MgoBidding.FindById("bidding_back", id, public.MgoBiddingFields)
|
|
|
+ }
|
|
|
+ obj = *aobj
|
|
|
}
|
|
|
toptype := common.InterfaceToStr(obj["toptype"])
|
|
|
subtype := common.InterfaceToStr(obj["subtype"])
|
WH01243