feat:未登录招标公告出不来调整

src/jfw/front/shorturl.go

@@ -1,36 +1,37 @@
 package front
 
 import (
-    "database/sql"
-    "errors"
-    "fmt"
-    "jy/src/jfw/config"
-    "jy/src/jfw/wx"
-    "log"
-    "math/rand"
-    "net/url"
-    "strconv"
+	"database/sql"
+	"errors"
+	"fmt"
+	"jy/src/jfw/config"
+	"jy/src/jfw/wx"
+	"log"
+	"math/rand"
+	"net/url"
+	"strconv"
 
-    "github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/gconv"
 
-    "jy/src/jfw/jyutil"
+	"jy/src/jfw/jyutil"
 
-    "app.yhyue.com/moapp/jypkg/public"
+	"app.yhyue.com/moapp/jypkg/public"
 
-    util "app.yhyue.com/moapp/jybase/common"
-    "app.yhyue.com/moapp/jybase/date"
+	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/date"
+	mg "app.yhyue.com/moapp/jybase/mongodb"
 
-    elastic "app.yhyue.com/moapp/jybase/es"
-    "regexp"
-    "strings"
-    "time"
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"regexp"
+	"strings"
+	"time"
 
-    "app.yhyue.com/moapp/jybase/encrypt"
-    "app.yhyue.com/moapp/jybase/go-xweb/xweb"
-    "app.yhyue.com/moapp/jybase/redis"
-    "app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
-    "github.com/SKatiyar/qr"
-    "go.mongodb.org/mongo-driver/bson"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"app.yhyue.com/moapp/jybase/redis"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	"github.com/SKatiyar/qr"
+	"go.mongodb.org/mongo-driver/bson"
 )
 
 type Short struct {
@@ -275,7 +276,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 	if userId == "" && ssOpenid != nil {
 		res, ok = mongodb.FindOneByField("user", bson.M{"s_m_openid": ssOpenid, "s_unionid": bson.M{"$ne": ssOpenid}}, `{"i_vip_status":1,"i_member_status":1,"s_m_phone":1,"s_phone":1,"l_vip_starttime":1}`)
 		if ok {
-			userId = BsonIdToSId((*res)["_id"])
+			userId = mg.BsonIdToSId((*res)["_id"])
 		}
 	} else if userId != "" {
 		//判断用户是否是vip
@@ -702,7 +703,7 @@ func UserPermission(userId string, ssOpenid interface{}) (bool, bool, bool) {
 	)
 	if userId == "" && ssOpenid != nil {
 		res, _ = mongodb.FindOneByField("user", bson.M{"s_m_openid": ssOpenid, "s_unionid": bson.M{"$ne": ssOpenid}}, `{"i_vip_status":1,"i_member_status":1,"s_m_phone":1,"s_phone":1}`)
-		userId = BsonIdToSId((*res)["_id"])
+		userId = mg.BsonIdToSId((*res)["_id"])
 	} else {
 		//判断用户是否是vip
 		res = jyutil.Compatible.Select(userId, `{"i_vip_status":1,"i_member_status":1,"s_m_phone":1,"s_phone":1}`)
@@ -910,7 +911,7 @@ func getwinnertel(company interface{}) string {
 func GetUserId(openid string) string {
 	data, ok := public.MQFW.FindOne("user", map[string]interface{}{"s_m_openid": openid})
 	if data != nil && len(*data) > 0 && ok {
-		userid := BsonIdToSId((*data)["_id"])
+		userid := mg.BsonIdToSId((*data)["_id"])
 		return userid
 	}
 	return ""
@@ -982,11 +983,13 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 			detail = strings.ReplaceAll(detail, util.ObjToString(obj[dk]), detailText)
 		}
 		//中标企业信息
-		if dk == "winnerMap" && obj[dk] != nil {
+		if dk == "winnerMap" {
 			winnerNewMap := map[string]interface{}{}
-			winnerMap := util.ObjToMap(obj[dk])
-			for _, wv := range *winnerMap {
-				winnerNewMap[mosaicText] = wv
+			if obj[dk] != nil {
+				winnerMap := util.ObjToMap(obj[dk])
+				for _, wv := range *winnerMap {
+					winnerNewMap[mosaicText] = wv
+				}
 			}
 			obj[dk] = winnerNewMap
 		} else {