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

src/jfw/front/shorturl.go

@@ -1074,8 +1074,12 @@ func otherFilter(obj map[string]interface{}, isLogin bool) map[string]interface{
 		obj[dk] = mosaicText
 	}
 	if obj["subtype"] == "拟建" {
-		delete(obj, "projectinfo")
-		//obj["projectinfo"] = projectinfo
+		for k := range projectinfo {
+			if _, ok := otherMosaic[k]; !ok {
+				delete(projectinfo, k)
+			}
+		}
+		obj["projectinfo"] = projectinfo
 	}
 	obj["detail"] = detail
 	return obj

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

@@ -396,8 +396,12 @@ func otherFilter(obj map[string]interface{}, isLogin bool) map[string]interface{
 		obj[dk] = mosaicText
 	}
 	if obj["subtype"] == "拟建" {
-		delete(obj, "projectinfo")
-		//obj["projectinfo"] = projectinfo
+		for k := range projectinfo {
+			if _, ok := otherMosaic[k]; !ok {
+				delete(projectinfo, k)
+			}
+		}
+		obj["projectinfo"] = projectinfo
 	}
 	obj["detail"] = detail
 	return obj