瀏覽代碼

获取添加人列表

xyxie 7 月之前
父節點
當前提交
b056033885

+ 34 - 0
controllers/knowledge/resource.go

@@ -1062,3 +1062,37 @@ func (this *ResourceController) GetSourceFrom() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// GetAdminList
+// @Title 获取所有创建人
+// @Description 获取所有创建人
+// @Success 200 {object} models.EdbdataClassifyResp
+// @router /resource/admins [get]
+func (this *ResourceController) GetAdminList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请重新登录"
+		return
+	}
+	resourceType, _ := this.GetInt("ResourceType")
+	keyword := this.GetString("Keyword")
+	resourceObj := new(knowledge.KnowledgeResource)
+	list, err := resourceObj.GetAdmins(keyword, resourceType)
+	if err != nil {
+		br.Msg = "获取数据失败"
+		br.Msg = "获取数据失败,Err:" + err.Error()
+		return
+	}
+	resp := new(knowledge.GetAdminsResp)
+	resp.List = list
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

+ 16 - 0
models/knowledge/knowledge_resource.go

@@ -255,3 +255,19 @@ type UpdateResourceResp struct {
 type GetSourceFromResp struct {
 	List []string `description:"来源列表"`
 }
+type GetAdminsResp struct {
+	List []*GetAdminsRespItem `description:"添加人"`
+}
+type GetAdminsRespItem struct {
+	AdminId       int    `gorm:"column:admin_id" description:"创建者账号"`
+	AdminRealName string `gorm:"column:admin_real_name" description:"创建者姓名"`
+}
+
+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())
+	if keyword != `` {
+		sql += ` AND admin_real_name LIKE '%` + keyword + `%'`
+	}
+	err = global.DmSQL["rddp"].Raw(sql, resourceType).Scan(&items).Error
+	return
+}

+ 9 - 0
routers/commentsRouter.go

@@ -7270,6 +7270,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"],
+        beego.ControllerComments{
+            Method: "GetAdminList",
+            Router: `/resource/admins`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"],
         beego.ControllerComments{
             Method: "Delete",

+ 2 - 2
services/knowledge/classify.go

@@ -39,7 +39,7 @@ func MoveKnowledgeClassify(req knowledge.ClassifyMoveReq) (err error, errMsg str
 		return
 	} else if classifyInfo.ClassifyId == 0 {
 		errMsg = "分类不存在, 请刷新页面"
-		err = fmt.Errorf("获取分类信息失败,Err:" + err.Error())
+		err = fmt.Errorf("获取分类信息失败")
 		return
 	}
 
@@ -387,7 +387,7 @@ func EditKnowledgeClassify(classifyId, parentId int, classifyName string, resour
 	existName, e := knowledgeObj.GetClassifyByName(classifyName, parentId, item.ResourceType)
 	if e != nil && !utils.IsErrNoRow(e) {
 		errMsg = "分类名称已存在"
-		err = errors.New("获取重名分类失败, Err: " + err.Error())
+		err = errors.New("获取重名分类失败, Err: " + e.Error())
 		return
 	}
 	if existName != nil && existName.ClassifyId > 0 && existName.ClassifyId != item.ClassifyId {