克隆版本

src/jy/admin/admin.go

@@ -39,7 +39,12 @@ func init() {
 	})
 	//获取城市列表
 	Admin.POST("/getcitys", func(c *gin.Context) {
-		list, _ := Mgo.Find("citys", `{}`, `{"_id":-1}`, nil, false, -1, -1)
+		list, b := Mgo.Find("citys", `{}`, `{"_id":-1}`, nil, false, -1, -1)
+		if b && list != nil {
+			for _, v := range *list {
+				v["s_field"] = ""
+			}
+		}
 		data := []map[string]interface{}{map[string]interface{}{"_id": "", "s_name": ""}}
 		data = append(data, *list...)
 		c.JSON(200, gin.H{"data": data})

src/jy/admin/version.go

@@ -2,6 +2,7 @@
 package admin
 
 import (
+	"fmt"
 	. "jy/mongodbutil"
 	"jy/util"
 	"log"
@@ -109,6 +110,7 @@ func init() {
 func copyComRules(version, pvid, s_username string) {
 	tmp, _ := Mgo.FindById("version", pvid, nil)
 	oldversion := (*tmp)["version"].(string)
+	fmt.Println("version---", version, "	oldversion---", oldversion, "	pvid---", pvid, "	username---", s_username)
 	//克隆前置规则
 	plist, _ := Mgo.Find("rule_pre", `{"s_version":"`+oldversion+`"}`, nil, nil, false, -1, -1)
 	for _, v := range *plist {
@@ -132,18 +134,33 @@ func copyComRules(version, pvid, s_username string) {
 		Mgo.Save("rule_back", v)
 	}
 	//克隆tag
-	/*
-		tlist, _ := Mgo.Find("tag", `{"s_version":"`+oldversion+`"}`, nil, nil, false, -1, -1)
-		for _, v := range *tlist {
-			oldId := qu.BsonIdToSId(v["_id"])
-			delete(v, "_id")
-			v["s_version"] = version
-			v["s_creater"] = s_username
-			v["l_intime"] = time.Now().Unix()
-			id := Mgo.Save("tag", v)
+	tlist, _ := Mgo.Find("tag", `{"s_version":"`+oldversion+`"}`, nil, nil, false, -1, -1)
+	for _, v := range *tlist {
+		oldId := qu.BsonIdToSId(v["_id"])
+		delete(v, "_id")
+		v["s_version"] = version
+		v["s_creater"] = s_username
+		v["l_intime"] = time.Now().Unix()
+		newId := Mgo.Save("tag", v) //克隆父标签
+		td, _ := Mgo.Find("tagdetailinfo", `{"s_parentid":"`+oldId+`"}`, nil, nil, false, -1, -1)
+		for _, v2 := range *td {
+			delete(v2, "_id")
+			v2["s_version"] = version
+			v2["s_creater"] = s_username
+			v2["l_intime"] = time.Now().Unix()
+			v2["s_parentid"] = newId
+			Mgo.Save("tagdetailinfo", v2) //克隆详细标签
 		}
-	*/
+	}
 	//克隆函数
+	clist, _ := Mgo.Find("cleanup", `{"s_version":"`+oldversion+`"}`, nil, nil, false, -1, -1)
+	for _, v := range *clist {
+		delete(v, "_id")
+		v["s_version"] = version
+		v["s_creater"] = s_username
+		v["l_intime"] = time.Now().Unix()
+		Mgo.Save("cleanup", v)
+	}
 }
 
 //克隆版本Field

src/web/templates/admin/onetag.html

@@ -302,6 +302,7 @@ function saveaddone(){
 		alert("名称或省/直辖市数据错误!");
 			return false;
 	}
+	console.log("field---",namearr[1])
 	$.ajax({
 		url:"/admin/onetag/create",
 		type:"post",