浏览代码

fix:代码回退

duxin 2 年之前
父节点
当前提交
de86c36dd8
共有 2 个文件被更改,包括 9 次插入10 次删除
  1. 4 5
      src/jfw/front/shorturl.go
  2. 5 5
      src/jfw/modules/app/src/app/front/shorturl.go

+ 4 - 5
src/jfw/front/shorturl.go

@@ -929,7 +929,9 @@ 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{}{}
@@ -939,10 +941,7 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 				}
 				obj[k] = winnerNewMap
 			} else {
-                if util.ObjToString(obj[k]) != "" {
-                    detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
-                    obj[k] = mosaicText
-                }
+				obj[k] = mosaicText
 			}
 		}
 	}

+ 5 - 5
src/jfw/modules/app/src/app/front/shorturl.go

@@ -288,6 +288,9 @@ 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.InterfaceToStr(obj[k]) != "" {
+				detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
+			}
 			//中标企业信息
 			if k == "winnerMap" && obj[k] != nil {
 				winnerNewMap := map[string]interface{}{}
@@ -297,11 +300,8 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 				}
 				obj[k] = winnerNewMap
 			} else {
-                if util.InterfaceToStr(obj[k]) != "" {
-                    detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
-                    obj[k] = mosaicText
-                }
-            }
+				obj[k] = mosaicText
+			}
 		}
 	}
 	obj["detail"] = detail