|
@@ -636,12 +636,12 @@ func (this *CalendarController) CalendarDetail() {
|
|
companyId := calendarItem.CompanyId
|
|
companyId := calendarItem.CompanyId
|
|
companyProductItem, err := models.GetCompanyProductByCompanyIdAndProductId(companyId, 1)
|
|
companyProductItem, err := models.GetCompanyProductByCompanyIdAndProductId(companyId, 1)
|
|
if err != nil {
|
|
if err != nil {
|
|
- this.FailWithMessage("获取数据失败", "获取数据失败!GetRsCalendarResearcherById:"+err.Error())
|
|
|
|
|
|
+ this.FailWithMessage("获取数据失败", "获取数据失败!GetCompanyProductByCompanyIdAndProductId:"+err.Error())
|
|
return
|
|
return
|
|
}
|
|
}
|
|
permissionList, err := models.GetCompanyProductReportPermissionList(companyId, 1)
|
|
permissionList, err := models.GetCompanyProductReportPermissionList(companyId, 1)
|
|
if err != nil {
|
|
if err != nil {
|
|
- this.FailWithMessage("搜索客户权限失败", "搜索客户权限失败!GetRsCalendarResearcherById:"+err.Error())
|
|
|
|
|
|
+ this.FailWithMessage("搜索客户权限失败", "搜索客户权限失败!GetCompanyProductReportPermissionList:"+err.Error())
|
|
return
|
|
return
|
|
}
|
|
}
|
|
var permissionArr []string
|
|
var permissionArr []string
|
|
@@ -662,7 +662,7 @@ func (this *CalendarController) CalendarDetail() {
|
|
if calendarItem.EnglishCompany == 1 {
|
|
if calendarItem.EnglishCompany == 1 {
|
|
enItem, e := english_company.GetEnglishCompanyById(calendarItem.CompanyId)
|
|
enItem, e := english_company.GetEnglishCompanyById(calendarItem.CompanyId)
|
|
if e != nil {
|
|
if e != nil {
|
|
- this.FailWithMessage("搜索客户失败!", "获取英文客户详情失败, Err: "+e.Error())
|
|
|
|
|
|
+ this.FailWithMessage("搜索客户失败!", "获取英文客户详情失败, GetEnglishCompanyById Err: "+e.Error())
|
|
return
|
|
return
|
|
}
|
|
}
|
|
companyDetailView.CompanyId = enItem.CompanyId
|
|
companyDetailView.CompanyId = enItem.CompanyId
|