修改添加、删除个人标签接口

controllers/partial/SystemController.go

@@ -3184,22 +3184,28 @@ func System_GetTag(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_AddUserTag(c *entitys.CtrlContext) {
-	user_id := c.Ctx.Query("user_id")
-	tag_id := c.Ctx.Query("tag_id")
+	//user_id := c.Ctx.Query("user_id")
+	//	//tag_id := c.Ctx.Query("tag_id")
+
+	var userTag models.SysUserTag
+	if err := c.Ctx.BindJSON(&userTag); err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
 
 	userId := c.Ctx.GetString("user_id")
 
-	userTag := sysmodel.SysUserTag{}
+	//userTag := sysmodel.SysUserTag{}
 	userTag.Id = sysutils.NewUUID()
-	userTag.UserId = user_id
-	userTag.TagId = tag_id
+	//userTag.UserId = user_id
+	//userTag.TagId = tag_id
 	userTag.CreateTime = sysmodel.NowLocal()
 	userTag.CreateBy = userId
 	userTag.LastUpdateTime = time.Now().UnixNano()
 	userTag.LastUpdateBy = userId
 	userTag.DelFlag = 0
 
-	if _, err := c.Db.Insert(&userTag); err != nil {
+	if _, err := c.Db.Insert(&userTag); err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})

light-apiengine.xml

@@ -605,7 +605,7 @@
             <api name="add_tag_group" desc="添加标签分组" method="post,get,put">
                 <param name="name" type="string" desc="分组名称"/>
                 <param name="code" type="string" desc="编码"/>
-                <param name="tags" type="string" desc="标签"/>
+                <param name="tags" ref="$tag array" desc="标签"/>
                 <return>
                     <success ref="$sys_return"></success>
                     <failure ref="$sys_return"></failure>

sqlconfig/system_controller/system_tag_group_page_select.tpl

@@ -1,14 +1,19 @@
 
 SELECT
-    sys_tag_group.*
+    sys_tag_group.*,
+    CONCAT('[',GROUP_CONCAT(CONCAT('{id:"',sys_tag.id,'", name:"',sys_tag.name,'"}')),']') tags
 FROM
-    sys_tag_group
+    sys_tag_group,
+    sys_tag
 WHERE
-    del_flag = 0
+    sys_tag_group.del_flag = 0
+    and sys_tag.del_flag = 0
+    and sys_tag_group.id = sys_tag.group_id
     {{if ne .name ""}}
         and sys_tag_group.name like '%{{.name}}%'
     {{end}}
     {{if ne .code ""}}
         and sys_tag_group.code = '{{.code}}'
     {{end}}
+    GROUP BY sys_tag_group.id
 LIMIT {{.rows}} OFFSET {{.offset}}