展示机构名称

controllers/chart_classify.go

@@ -216,9 +216,23 @@ func (this *ChartClassifyController) SimpleList() {
 		}
 
 		if len(allChartInfo) > 0 {
+			// 查询机构名称
+			adminIds := make([]int, 0)
+			for _, v := range allChartInfo {
+				adminIds = append(adminIds, v.SysUserId)
+			}
+
+			adminCompanyMap, er := services.GetCompanyNameByAdmins(adminIds)
+			if er != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取机构失败，Err:" + er.Error()
+				return
+			}
 			for _, v := range allChartInfo {
 				v.Children = make([]*models.ChartClassifyItems, 0)
-				v.Company = "弘则研究"
+				if n, ok := adminCompanyMap[v.SysUserId]; ok {
+					v.Company = n
+				}
 				nodeAll = append(nodeAll, v)
 			}
 		}
@@ -616,9 +630,9 @@ func (this *ChartClassifyController) ChartClassifyMove() {
 		return
 	}
 
-	if req.ClassifyId <= 0 {
+	if req.ClassifyId <= 0 && req.ChartInfoId <= 0 {
 		br.Msg = "参数错误"
-		br.ErrMsg = "分类id小于等于0"
+		br.ErrMsg = "请选择分类或者图表"
 		return
 	}
 	//判断分类是否存在
@@ -868,8 +882,22 @@ func (this *ChartClassifyController) ChartClassifyChartListV2() {
 		}
 	}
 	if len(allChartInfo) > 0 {
-		for k, _ := range allChartInfo {
-			allChartInfo[k].Company = "弘则研究"
+		adminIds := make([]int, 0)
+		for _, v := range allChartInfo {
+			adminIds = append(adminIds, v.SysUserId)
+		}
+
+		adminCompanyMap, er := services.GetCompanyNameByAdmins(adminIds)
+		if er != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取机构失败，Err:" + er.Error()
+			return
+		}
+		for k, v := range allChartInfo {
+			v.Children = make([]*models.ChartClassifyItems, 0)
+			if n, ok := adminCompanyMap[v.SysUserId]; ok {
+				allChartInfo[k].Company = n
+			}
 		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, int(total))

services/system.go

@@ -0,0 +1,44 @@
+package services
+
+import (
+	"eta/eta_forum_admin/models/system"
+	"eta/eta_forum_admin/utils"
+	"fmt"
+)
+
+func GetCompanyNameByAdmins(adminIds []int) (adminCompanyMap map[int]string, err error) {
+	// 查询所有机构
+	ob := new(system.EtaBusiness)
+	companyList, er := ob.GetItemsByCondition("", make([]interface{}, 0), []string{}, "")
+	if er != nil {
+		err = fmt.Errorf("获取机构信息失败 %s", err.Error())
+		return
+	}
+	companyMap := make(map[string]string)
+	if len(companyList) > 0 {
+		for _, v := range companyList {
+			companyMap[v.BusinessCode] = v.BusinessName
+		}
+	}
+	//查询机构下的用户
+	admin := new(system.Admin)
+	cond := ` AND admin_id in (` + utils.GetOrmInReplace(len(adminIds)) + `)`
+	pars := make([]interface{}, 0)
+	pars = append(pars, adminIds)
+	adminList, err := admin.GetItemsByCondition(cond, pars, []string{}, "")
+	if err != nil {
+		err = fmt.Errorf("获取机构用户失败 %s", err.Error())
+		return
+	}
+
+	adminCompanyMap = make(map[int]string)
+	if len(adminList) > 0 {
+		for _, v := range adminList {
+			tmp, ok := companyMap[v.BusinessCode]
+			if ok {
+				adminCompanyMap[v.AdminId] = tmp
+			}
+		}
+	}
+	return
+}

utils/config.go

@@ -127,7 +127,8 @@ func init() {
 		logMaxDaysStr := config["log_max_day"]
 		LogMaxDays, _ = strconv.Atoi(logMaxDaysStr)
 	}
-
+	// 接口返回加密KEY
+	DesKey = config["des_key"]
 	{
 		// 报警服务地址
 		AlarmMsgUrl = config["alarm_msg_url"]