Merge branch 'dev/v4.8.34_dx' of qmx/jy into feature/v4.8.34

src/jfw/front/shorturl.go

@@ -929,9 +929,7 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 	detailText := fmt.Sprintf(`<span class="noLoginMosaic" style="color: #2ABED1;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
 	for k, _ := range obj {
 		if ok, _ := detailNeedMosaic[k].(bool); ok {
-			if util.ObjToString(obj[k]) != "" {
-				detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
-			}
+
 			//中标企业信息
 			if k == "winnerMap" && obj[k] != nil {
 				winnerNewMap := map[string]interface{}{}
@@ -941,7 +939,10 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 				}
 				obj[k] = winnerNewMap
 			} else {
-				obj[k] = mosaicText
+                if util.ObjToString(obj[k]) != "" {
+                    detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
+                    obj[k] = mosaicText
+                }
 			}
 		}
 	}

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

@@ -288,9 +288,6 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 	for k, _ := range obj {
 		detailNeedMosaic, _ := config.Sysconfig["detailNeedMosaic"].(map[string]interface{})
 		if ok, _ := detailNeedMosaic[k].(bool); ok {
-			if util.ObjToString(obj[k]) != "" {
-				detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
-			}
 			//中标企业信息
 			if k == "winnerMap" && obj[k] != nil {
 				winnerNewMap := map[string]interface{}{}
@@ -300,8 +297,11 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 				}
 				obj[k] = winnerNewMap
 			} else {
-				obj[k] = mosaicText
-			}
+                if util.InterfaceToStr(obj[k]) != "" {
+                    detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
+                    obj[k] = mosaicText
+                }
+            }
 		}
 	}
 	obj["detail"] = detail