Merge branch 'small_226_newFields' into debug

# Conflicts:
#	models/data_manage/chart_info.go
#	services/data/chart_info.go

controllers/user_login.go

@@ -558,6 +558,8 @@ func (this *UserLoginController) Login() {
 	}
 	resp.ProductName = productName
 	resp.Authority = sysUser.Authority
+	resp.DepartmentName = sysUser.DepartmentName
+	resp.GroupName = sysUser.GroupName
 
 	// 设置redis缓存
 	{
@@ -1032,6 +1034,13 @@ func (this *UserLoginController) BaseInfo() {
 		return
 	}
 
+	companyName, e := models.GetBusinessConfByKey("CompanyName")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
+		return
+	}
+
 	type BaseInfoResp struct {
 		Icp           *models.BusinessConf `description:"Icp信息"`
 		ETATitle      *models.BusinessConf `description:"eta系统名称"`
@@ -1039,6 +1048,7 @@ func (this *UserLoginController) BaseInfo() {
 		LogoCn        *models.BusinessConf `description:"中文logo"`
 		LogoEn        *models.BusinessConf `description:"英文logo"`
 		LogoMobile    *models.BusinessConf `description:"移动端logo"`
+		CompanyName   *models.BusinessConf `description:"公司名称"`
 	}
 
 	resp := BaseInfoResp{
@@ -1048,6 +1058,7 @@ func (this *UserLoginController) BaseInfo() {
 		LogoCn:        logoCn,
 		LogoEn:        logoEn,
 		LogoMobile:    logoMobile,
+		CompanyName:   companyName,
 	}
 
 	br.Data = resp

models/system/sys_user.go

@@ -24,6 +24,8 @@ type LoginResp struct {
 	AdminId         int    `description:"系统用户id"`
 	ProductName     string `description:"产品名称：admin,ficc,权益"`
 	Authority       int    `description:"管理权限，0：无，1：部门负责人，2：小组负责人,或者ficc销售主管，4:ficc销售组长"`
+	DepartmentName  string `description:"部门名称"`
+	GroupName       string `description:"分组名称"`
 }
 
 type Admin struct {