Merge branch 'bug/6746' into debug

controllers/data_manage/cross_variety/tag.go

@@ -115,7 +115,7 @@ func (c *TagController) Edit() {
 		br.ErrMsg = "添加失败，Err:" + err.Error()
 		return
 	}
-	if item != nil && item.ChartTagId != req.ChartTagId {
+	if item != nil && item.ChartTagId > 0 && item.ChartTagId != req.ChartTagId {
 		br.Msg = "添加失败，标签名称不能重复"
 		br.IsSendEmail = false
 		return