商户名称

controllers/admin.go

@@ -30,13 +30,13 @@ func (this *AdminController) GetBusinessAdmin() {
 		return
 	}
 	// 查询所有机构
-	ob := new(system.EtaBusiness)
+	/*ob := new(system.EtaBusiness)
 	companyList, err := ob.GetItemsByCondition("", make([]interface{}, 0), []string{}, "")
 	if err != nil {
 		br.Msg = "获取机构信息失败"
 		br.ErrMsg = err.Error()
 		return
-	}
+	}*/
 	list := make([]*system.BusinessAdmin, 0)
 	// todo 查询上传图表的所有用户ID
 	creators, err := models.GetChartCreators()
@@ -75,6 +75,11 @@ func (this *AdminController) GetBusinessAdmin() {
 			companyMap[v.BusinessCode] = append(companyMap[v.BusinessCode], tmp)
 		}
 	}
+	companyList := make([]*system.HzEtaBusiness, 0)
+	hzCompany := new(system.HzEtaBusiness)
+	hzCompany.BusinessName = utils.HzCompanyName
+	hzCompany.BusinessCode = utils.HzBusinessCodeRelease
+	companyList = append(companyList, hzCompany)
 	if len(companyList) > 0 {
 		for _, v := range companyList {
 			tmp := &system.BusinessAdmin{

controllers/chart_classify.go

@@ -217,7 +217,7 @@ func (this *ChartClassifyController) SimpleList() {
 
 		if len(allChartInfo) > 0 {
 			// 查询机构名称
-			adminIds := make([]int, 0)
+			/*adminIds := make([]int, 0)
 			for _, v := range allChartInfo {
 				adminIds = append(adminIds, v.SysUserId)
 			}
@@ -227,12 +227,12 @@ func (this *ChartClassifyController) SimpleList() {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取机构失败，Err:" + er.Error()
 				return
-			}
+			}*/
 			for _, v := range allChartInfo {
 				v.Children = make([]*models.ChartClassifyItems, 0)
-				if n, ok := adminCompanyMap[v.SysUserId]; ok {
-					v.Company = n
-				}
+				//if n, ok := adminCompanyMap[v.SysUserId]; ok {
+				v.Company = utils.HzCompanyName
+				//}
 				nodeAll = append(nodeAll, v)
 			}
 		}
@@ -891,7 +891,7 @@ func (this *ChartClassifyController) ChartClassifyChartListV2() {
 	}
 
 	if len(allChartInfo) > 0 {
-		adminIds := make([]int, 0)
+		/*adminIds := make([]int, 0)
 		for _, v := range allChartInfo {
 			adminIds = append(adminIds, v.SysUserId)
 		}
@@ -901,12 +901,12 @@ func (this *ChartClassifyController) ChartClassifyChartListV2() {
 			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
-			}
+			//if n, ok := adminCompanyMap[v.SysUserId]; ok {
+			allChartInfo[k].Company = utils.HzCompanyName
+			//}
 		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, int(total))

controllers/chart_info.go

@@ -454,7 +454,7 @@ func (this *ChartInfoController) ChartList() {
 	}
 
 	if len(allChartInfo) > 0 {
-		adminIds := make([]int, 0)
+		/*adminIds := make([]int, 0)
 		for _, v := range allChartInfo {
 			adminIds = append(adminIds, v.SysUserId)
 		}
@@ -463,12 +463,12 @@ func (this *ChartInfoController) ChartList() {
 			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
-			}
+			//if n, ok := adminCompanyMap[v.SysUserId]; ok {
+			allChartInfo[k].Company = utils.HzCompanyName
+			//}
 		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, int(total))

models/system/admin.go

@@ -207,3 +207,8 @@ func GetSysUserItems(condition string, pars []interface{}) (items []*Admin, err
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+type HzEtaBusiness struct {
+	BusinessName string `description:"商家名称"`
+	BusinessCode string
+}

models/system/eta_business.go

@@ -1,14 +1,6 @@
 package system
 
-import (
-	"eta/eta_forum_admin/utils"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"strings"
-	"time"
-)
-
+/*
 const (
 	EtaBusinessSigningStatusFirst = iota + 1
 	EtaBusinessSigningStatusContinue
@@ -242,3 +234,4 @@ type EtaBusinessItem struct {
 	CreateTime       string `description:"创建时间"`
 	ModifyTime       string `description:"更新时间"`
 }
+*/

services/system.go

@@ -1,12 +1,6 @@
 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) {
+/*func GetCompanyNameByAdmins(adminIds []int) (adminCompanyMap map[int]string, err error) {
 	// 查询所有机构
 	ob := new(system.EtaBusiness)
 	companyList, er := ob.GetItemsByCondition("", make([]interface{}, 0), []string{}, "")
@@ -41,4 +35,4 @@ func GetCompanyNameByAdmins(adminIds []int) (adminCompanyMap map[int]string, err
 		}
 	}
 	return
-}
+}*/

utils/constants.go

@@ -350,3 +350,6 @@ var DataSourceEnMap = map[int]string{
 const BusinessCodeSalt = "dr7WY0OZgGR7upw1"
 
 //const CrmEtaAuthorization = "NIi1RbEmH0C2rksXtPGDPBBgRgTZY87Q"
+
+const HzCompanyName = "弘则研究"
+const HzBusinessCodeRelease = "E2023080900" // 生产环境