|
@@ -4,6 +4,7 @@ import (
|
|
|
"hongze/hz_crm_api/models"
|
|
|
"hongze/hz_crm_api/models/company"
|
|
|
"hongze/hz_crm_api/models/roadshow"
|
|
|
+ "hongze/hz_crm_api/services"
|
|
|
"hongze/hz_crm_api/utils"
|
|
|
"strings"
|
|
|
)
|
|
@@ -76,11 +77,13 @@ func (this *CalendarController) CompanyDetail() {
|
|
|
return
|
|
|
}
|
|
|
englishCompany, _ := this.GetInt("EnglishCompany")
|
|
|
-
|
|
|
- resp := make([]roadshow.CompanyDetailView,0)
|
|
|
+ productId := services.GetProductId(sysUser.RoleTypeCode)
|
|
|
+ if productId == 0 {
|
|
|
+ productId = 1
|
|
|
+ }
|
|
|
+ detailView := new(roadshow.CompanyDetailView)
|
|
|
if englishCompany == 0 {
|
|
|
- //companyProductItem, err := company.GetCompanyProductByCompanyIdAndProductId(companyId, 1)
|
|
|
- companyProductList, err := company.GetCompanyProductsByCompanyId(companyId)
|
|
|
+ companyProductItem, err := company.GetCompanyProductByCompanyIdAndProductId(companyId, productId)
|
|
|
if err != nil {
|
|
|
if err.Error() == utils.ErrNoRow() {
|
|
|
br.Msg = "该客户已被删除"
|
|
@@ -90,34 +93,27 @@ func (this *CalendarController) CompanyDetail() {
|
|
|
br.ErrMsg = "搜索客户失败!Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- for _, v := range companyProductList {
|
|
|
- detailView := new(roadshow.CompanyDetailView)
|
|
|
- detailView.CompanyId = v.CompanyId
|
|
|
- detailView.CompanyName = v.CompanyName
|
|
|
- detailView.Status = v.Status
|
|
|
- detailView.IndustryId = v.IndustryId
|
|
|
- detailView.IndustryName = v.IndustryName
|
|
|
- detailView.ReportReadTotal = v.ViewTotal //ficc报告-累计阅读次数
|
|
|
-
|
|
|
- permissionList, err := company.GetCompanyProductReportPermissionList(companyId, v.ProductId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "搜索客户权限失败!"
|
|
|
- br.ErrMsg = "搜索客户权限失败!Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- var permissionArr []string
|
|
|
- for _, v := range permissionList {
|
|
|
- permissionArr = append(permissionArr, v.PermissionName)
|
|
|
- }
|
|
|
- detailView.PermissionName = strings.Join(permissionArr, "/")
|
|
|
-
|
|
|
- resp = append(resp, *detailView)
|
|
|
+ permissionList, err := company.GetCompanyProductReportPermissionList(companyId, productId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "搜索客户权限失败!"
|
|
|
+ br.ErrMsg = "搜索客户权限失败!Err:" + err.Error()
|
|
|
+ return
|
|
|
}
|
|
|
-
|
|
|
+ var permissionArr []string
|
|
|
+ for _, v := range permissionList {
|
|
|
+ permissionArr = append(permissionArr, v.PermissionName)
|
|
|
+ }
|
|
|
+ detailView.CompanyId = companyProductItem.CompanyId
|
|
|
+ detailView.CompanyName = companyProductItem.CompanyName
|
|
|
+ detailView.Status = companyProductItem.Status
|
|
|
+ detailView.IndustryId = companyProductItem.IndustryId
|
|
|
+ detailView.IndustryName = companyProductItem.IndustryName
|
|
|
+ detailView.PermissionName = strings.Join(permissionArr, "/")
|
|
|
+ detailView.ReportReadTotal = companyProductItem.ViewTotal //ficc报告-累计阅读次数
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "获取成功"
|
|
|
- br.Data = resp
|
|
|
+ br.Data = detailView
|
|
|
return
|
|
|
}
|
|
|
|
|
@@ -128,7 +124,6 @@ func (this *CalendarController) CompanyDetail() {
|
|
|
br.ErrMsg = "获取英文客户详情失败!Err:" + e.Error()
|
|
|
return
|
|
|
}
|
|
|
- detailView := new(roadshow.CompanyDetailView)
|
|
|
detailView.CompanyId = enItem.CompanyId
|
|
|
detailView.CompanyName = enItem.CompanyName
|
|
|
detailView.Status = "正常"
|