Merge branch 'dev/v4.8.27.4_wh' of qmx/jy into hotfix/v4.8.27.4

src/jfw/front/shorturl.go

@@ -1154,8 +1154,13 @@ func RegDetail(html string) string {
 
 func KeyWordHandle(obj map[string]interface{}) string {
 	keywordArr := []string{}
-	if util.InterfaceToStr(obj["buyer"]) != "" && util.InterfaceToStr(obj["buyer"]) != config.Sysconfig["detailMosaicTxt"] {
-		keywordArr = append(keywordArr, util.InterfaceToStr(obj["buyer"]))
+	owner := util.InterfaceToStr(obj["owner"])
+	buyer := util.InterfaceToStr(obj["buyer"])
+	if buyer == "" {
+		buyer = owner
+	}
+	if buyer != "" && buyer != config.Sysconfig["detailMosaicTxt"] {
+		keywordArr = append(keywordArr, buyer)
 	}
 	if util.InterfaceToStr(obj["s_winner"]) != "" && util.InterfaceToStr(obj["s_winner"]) != config.Sysconfig["detailMosaicTxt"] {
 		keywordArr = append(keywordArr, util.InterfaceToStr(obj["s_winner"]))
@@ -1190,9 +1195,8 @@ func DescriptionHandle(stype string, obj map[string]interface{}) string {
 	pushTime := time.Unix(util.Int64All(obj["publishtime"]), 0)
 	title := util.InterfaceToStr(obj["title"])
 	owner := util.InterfaceToStr(obj["owner"])
-	subtype := util.InterfaceToStr(obj["subtype"])
 	buyer := util.InterfaceToStr(obj["buyer"])
-	if subtype == "拟建" {
+	if buyer == "" {
 		buyer = owner
 	}
 	s_winner := util.InterfaceToStr(obj["s_winner"])

src/jfw/modules/app/src/app/front/shorturl.go

@@ -642,7 +642,12 @@ func baseInfo(obj map[string]interface{}) string {
 }
 func KeyWordHandle(obj map[string]interface{}) string {
 	keywordArr := []string{}
-	if util.InterfaceToStr(obj["buyer"]) != "" && util.InterfaceToStr(obj["buyer"]) != config.Sysconfig["detailMosaicTxt"] {
+	owner := util.InterfaceToStr(obj["owner"])
+	buyer := util.InterfaceToStr(obj["buyer"])
+	if buyer == "" {
+		buyer = owner
+	}
+	if buyer != "" && buyer != config.Sysconfig["detailMosaicTxt"] {
 		keywordArr = append(keywordArr, util.InterfaceToStr(obj["buyer"]))
 	}
 	if util.InterfaceToStr(obj["s_winner"]) != "" && util.InterfaceToStr(obj["s_winner"]) != config.Sysconfig["detailMosaicTxt"] {
@@ -678,14 +683,13 @@ func DescriptionHandle(stype string, obj map[string]interface{}) string {
 	pushTime := time.Unix(util.Int64All(obj["l_publishtime"]), 0)
 	title := util.InterfaceToStr(obj["title"])
 	owner := util.InterfaceToStr(obj["owner"])
-	subtype := util.InterfaceToStr(obj["subtype"])
 	buyer := util.InterfaceToStr(obj["buyer"])
-	if subtype == "拟建" {
+	if buyer == "" {
 		buyer = owner
 	}
 	log.Println("3333333333333333publishtime", obj["publishtime"])
 	s_winner := util.InterfaceToStr(obj["s_winner"])
-	publishtime := util.Int64All(obj["publishtime"])
+	publishtime := util.Int64All(obj["l_publishtime"])
 	area := util.InterfaceToStr(obj["area"])
 	city := util.InterfaceToStr(obj["city"])
 	if stype == "bdprivate" {