|
@@ -97,6 +97,15 @@ func (this *ResearchController) CollectionList() {
|
|
|
}
|
|
|
|
|
|
pageSize, _ := this.GetInt("PageSize", 15)
|
|
|
+ resp := new(models.ArticleCollectionLIstResp)
|
|
|
+ if user.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
|
|
|
+ resp.List = make([]*models.ArticleCollectionResp, 0)
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = "获取成功"
|
|
|
+ br.Data = resp
|
|
|
+ return
|
|
|
+ }
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
articleTypeIds, err := services.GetYanXuanArticleTypeIds()
|
|
@@ -153,7 +162,7 @@ func (this *ResearchController) CollectionList() {
|
|
|
list[k].PublishDate = utils.StrTimeToTime(v.PublishDate).Format(utils.FormatDate) //时间字符串格式转时间格式
|
|
|
list[k].Pv = articleMapPv[v.ArticleId]
|
|
|
}
|
|
|
- resp := new(models.ArticleCollectionLIstResp)
|
|
|
+
|
|
|
resp.List = list
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
@@ -192,6 +201,16 @@ func (this *ResearchController) HotList() {
|
|
|
currentIndex = 1
|
|
|
}
|
|
|
startSize = utils.StartIndex(currentIndex, pageSize)
|
|
|
+ resp := new(models.IndustrialManagementHotListResp)
|
|
|
+ if user.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
|
|
|
+ resp.List = make([]*models.IndustrialManagementHotResp, 0)
|
|
|
+ resp.Paging = paging.GetPaging(currentIndex, pageSize, 0)
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = "获取成功"
|
|
|
+ br.Data = resp
|
|
|
+ return
|
|
|
+ }
|
|
|
var condition string
|
|
|
var conditionOrder string
|
|
|
articleTypeIds, err := services.GetYanXuanArticleTypeIds()
|
|
@@ -258,7 +277,7 @@ func (this *ResearchController) HotList() {
|
|
|
}
|
|
|
}
|
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
- resp := new(models.IndustrialManagementHotListResp)
|
|
|
+
|
|
|
resp.Paging = page
|
|
|
resp.List = list
|
|
|
br.Ret = 200
|
|
@@ -298,6 +317,18 @@ func (this *ResearchController) KolList() {
|
|
|
currentIndex = 1
|
|
|
}
|
|
|
startSize = utils.StartIndex(currentIndex, pageSize)
|
|
|
+
|
|
|
+ resp := new(models.DepartmentListResp)
|
|
|
+ if user.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
|
|
|
+ resp.List = make([]*models.DepartmentResp, 0)
|
|
|
+ resp.Paging = paging.GetPaging(currentIndex, pageSize, 0)
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = "获取成功"
|
|
|
+ br.Data = resp
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
articleTypeIds, err := services.GetYanXuanArticleTypeIds()
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|
|
@@ -368,7 +399,7 @@ func (this *ResearchController) KolList() {
|
|
|
v.IsHot = mapHot[v.DepartmentId]
|
|
|
//}
|
|
|
}
|
|
|
- resp := new(models.DepartmentListResp)
|
|
|
+
|
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
resp.Paging = page
|
|
|
resp.List = list
|
|
@@ -725,6 +756,17 @@ func (this *ResearchController) ArticleNewList() {
|
|
|
currentIndex = 1
|
|
|
}
|
|
|
startSize = paging.StartIndex(currentIndex, pageSize)
|
|
|
+ resp := new(models.ArticleResearchListResp)
|
|
|
+ if user.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
|
|
|
+ resp.List = make([]*models.ArticleResearchResp, 0)
|
|
|
+ resp.Paging = paging.GetPaging(currentIndex, pageSize, 0)
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = "获取成功"
|
|
|
+ br.Data = resp
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
var condition string
|
|
|
var conditiontype string
|
|
|
var pars []interface{}
|
|
@@ -819,7 +861,7 @@ func (this *ResearchController) ArticleNewList() {
|
|
|
return
|
|
|
}
|
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
- resp := new(models.ArticleResearchListResp)
|
|
|
+
|
|
|
for _, v := range list {
|
|
|
item := models.ArticleResearchResp{
|
|
|
ArticleId: v.ArticleId,
|