Merge branch 'release/v4.8.29_ws' of qmx/jy into release/v4.8.29

src/jfw/front/shorturl.go

@@ -979,8 +979,17 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 		if !dv.(bool) {
 			continue
 		}
-		if util.ObjToString(obj[dk]) != "" {
-			detail = strings.ReplaceAll(detail, util.ObjToString(obj[dk]), detailText)
+		//if util.ObjToString(obj[dk]) != "" {
+		//	detail = strings.ReplaceAll(detail, util.ObjToString(obj[dk]), detailText)
+		//}
+		if util.InterfaceToStr(obj[dk]) != "" {
+			value, b := obj[dk].(float64)
+			if b {
+				replaceStr := fmt.Sprintf("%v", int64(value))
+				detail = strings.ReplaceAll(detail, replaceStr, detailText)
+			} else {
+				detail = strings.ReplaceAll(detail, util.InterfaceToStr(obj[dk]), detailText)
+			}
 		}
 		//中标企业信息
 		if dk == "winnerMap" {

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

@@ -396,8 +396,17 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 		if !dv.(bool) {
 			continue
 		}
-		if util.ObjToString(obj[dk]) != "" {
-			detail = strings.ReplaceAll(detail, util.ObjToString(obj[dk]), detailText)
+		//if util.ObjToString(obj[dk]) != "" {
+		//	detail = strings.ReplaceAll(detail, util.ObjToString(obj[dk]), detailText)
+		//}
+		if util.InterfaceToStr(obj[dk]) != "" {
+			value, b := obj[dk].(float64)
+			if b {
+				replaceStr := fmt.Sprintf("%v", int64(value))
+				detail = strings.ReplaceAll(detail, replaceStr, detailText)
+			} else {
+				detail = strings.ReplaceAll(detail, util.InterfaceToStr(obj[dk]), detailText)
+			}
 		}
 		//中标企业信息
 		if dk == "winnerMap" {