xyxie 11 months ago
parent
commit
a84b12a28b
2 changed files with 29 additions and 3 deletions
  1. 20 3
      controllers/admin.go
  2. 9 0
      models/chart_info.go

+ 20 - 3
controllers/admin.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"eta/eta_forum_admin/models"
 	"eta/eta_forum_admin/models/system"
+	"eta/eta_forum_admin/utils"
 	"strconv"
 )
 
@@ -38,11 +39,27 @@ func (this *AdminController) GetBusinessAdmin() {
 	}
 	list := make([]*system.BusinessAdmin, 0)
 	// todo 查询上传图表的所有用户ID
-
+	creators, err := models.GetChartCreators()
+	if err != nil {
+		br.Msg = "获取上传图表的所有用户信息失败"
+		br.ErrMsg = err.Error()
+		return
+	}
+	if len(creators) == 0 {
+		var resp system.BusinessAdminResp
+		resp.List = list
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
 	//查询机构下的用户
 	admin := new(system.Admin)
-	cond := ""
-	adminList, err := admin.GetItemsByCondition(cond, make([]interface{}, 0), []string{}, "")
+	cond := ` AND admin_id in (` + utils.GetOrmInReplace(len(creators)) + `)`
+	pars := make([]interface{}, 0)
+	pars = append(pars, creators)
+	adminList, err := admin.GetItemsByCondition(cond, pars, []string{}, "")
 	if err != nil {
 		br.Msg = "获取机构用户失败"
 		br.ErrMsg = err.Error()

+ 9 - 0
models/chart_info.go

@@ -2047,3 +2047,12 @@ type ChartInfoListByEsResp struct {
 	Paging *paging.PagingItem
 	List   []*ChartInfoMore
 }
+
+// GetChartCreators 根据创建者查询图表
+func GetChartCreators() (sysUserIds []int, err error) {
+	o := orm.NewOrm()
+	// 查询图表的创建者ID
+	sql := `SELECT DISTINCT(chart_info.sys_user_id) AS sys_user_id FROM chart_info`
+	_, err = o.Raw(sql).QueryRows(&sysUserIds)
+	return
+}