Merge branch 'bzq/knowledge_add_viewpoint' into debug

controllers/knowledge/tag.go

@@ -7,6 +7,7 @@ import (
 	"eta_gn/eta_api/models/knowledge"
 	knowledgeServ "eta_gn/eta_api/services/knowledge"
 	"eta_gn/eta_api/utils"
+	"fmt"
 )
 
 // 标签
@@ -77,10 +78,7 @@ func (this *TagController) Delete() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	//todo 删除标签时，是否需要检测，标签下是否有事件
-	/*br.Msg = "报告标签不允许删除"
-	br.IsSendEmail = false
-	return*/
+
 	knowledgeObj := new(knowledge.KnowledgeTag)
 	item, err := knowledgeObj.GetTagById(req.TagId)
 	if err != nil {
@@ -99,6 +97,14 @@ func (this *TagController) Delete() {
 		return
 	}
 
+	// 取消标签的关联
+	resourceOb := new(knowledge.KnowledgeResource)
+	if e := resourceOb.RemoveTagRelateByTagId(req.TagId); e != nil {
+		br.Msg = "删除失败"
+		br.ErrMsg = fmt.Sprintf("移除事件标签关联失败, %v", e)
+		return
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "删除成功"

models/knowledge/knowledge_resource.go

@@ -412,7 +412,7 @@ type GetAdminsRespItem struct {
 }
 
 func (m *KnowledgeResource) GetAdmins(keyword string, resourceType int) (items []*GetAdminsRespItem, err error) {
-	sql := fmt.Sprintf(`SELECT distinct admin_id, admin_real_name FROM %s WHERE 1=1 and resource_type=? `, m.TableName())
+	sql := fmt.Sprintf(`SELECT distinct admin_id, admin_real_name FROM %s WHERE 1=1 AND admin_id > 0 and resource_type=? `, m.TableName())
 	if keyword != `` {
 		sql += ` AND admin_real_name LIKE '%` + keyword + `%'`
 	}
@@ -443,3 +443,10 @@ type KnowledgeResourceMapItem struct {
 	KnowledgeResourceId int
 	ResourceType        int
 }
+
+// RemoveTagRelateByTagId 移除标签关联
+func (m *KnowledgeResource) RemoveTagRelateByTagId(tagId int) (err error) {
+	sql := fmt.Sprintf(`UPDATE %s SET tag_id = 0 WHERE tag_id = ?`, m.TableName())
+	err = global.DmSQL["rddp"].Exec(sql, tagId).Error
+	return
+}