Merge branch 'need/cygx_1044' of http://8.136.199.33:3000/hongze/hongze_clpt

controllers/home.go

@@ -310,6 +310,10 @@ func (this *MobileHomeController) NewList() {
 		condition += " AND chart_permission_id  =  " + strconv.Itoa(chartPermissionId)
 	}
 
+	if user.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
+		conditionInit += ` AND source != 'yanxuanspecial'   AND IF   ( source IN('article') , chart_permission_id != 31 ,1=1 )    `
+	}
+
 	//if tagIds == "" && chartPermissionId == 0 {
 	//	//查询近一个月的数据
 	//	conditionInit += " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
@@ -373,6 +377,7 @@ func (this *MobileHomeController) NewList() {
 		condition += ` OR ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` )   `
 		pars = append(pars, activityspecialIds)
 	}
+
 	//}
 	//return
 	total, err = models.GetResourceDataCount(condition, pars)

controllers/research.go

@@ -90,6 +90,16 @@ func (this *MobileResearchController) ArticleNewList() {
 	var condition string
 	var conditiontype string
 	var pars []interface{}
+	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
+	}
 	condition = `    AND publish_status = 1  `
 	if articleTypeIds == "" || strings.Contains(articleTypeIds, "999") {
 		conditiontype = " AND is_show_yanx  = 1 "
@@ -145,7 +155,7 @@ func (this *MobileResearchController) ArticleNewList() {
 		return
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(models.ArticleResearchListResp)
+
 	for _, v := range list {
 
 		item := models.ArticleResearchResp{
@@ -239,7 +249,16 @@ func (this *MobileResearchController) 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
+	}
 	total, err := models.GetDepartmentlistCount("")
 	if err != nil {
 		br.Msg = "获取失败"
@@ -296,7 +315,7 @@ func (this *MobileResearchController) KolList() {
 			}
 		}
 	}
-	resp := new(models.DepartmentListResp)
+
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp.Paging = page
 	resp.List = list
@@ -338,6 +357,16 @@ func (this *MobileResearchController) HotList() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
 	var conditionOrder string
+	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
+	}
 	articleTypeIds, err := services.GetYanXuanArticleTypeIds()
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -403,7 +432,7 @@ func (this *MobileResearchController) HotList() {
 		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(models.IndustrialManagementHotListResp)
+
 	resp.Paging = page
 	resp.List = list
 	br.Ret = 200
@@ -809,6 +838,16 @@ func (this *MobileResearchController) Billboard() {
 	pageSize, _ := this.GetInt("PageSize", 15)
 	var condition string
 	var pars []interface{}
+	resp := new(models.ArticleResearchListResp)
+	if user.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
+		resp.List = make([]*models.ArticleResearchResp, 0)
+		resp.Paging = paging.GetPaging(1, pageSize, 0)
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
 	articleTypeIds, err := services.GetYanXuanArticleTypeIds()
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -849,7 +888,6 @@ func (this *MobileResearchController) Billboard() {
 		return
 	}
 
-	resp := new(models.ArticleResearchListResp)
 	for _, v := range list {
 		item := models.ArticleResearchResp{
 			ArticleId:       v.ArticleId,

controllers/yanxuan_special.go

@@ -54,6 +54,15 @@ func (this *YanxuanSpecialNoLoginController) List() {
 	}
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	resp := new(models.SpecialListResp)
+	if sysUser.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
+		resp.List = make([]*models.CygxYanxuanSpecialItem, 0)
+		resp.Paging = paging.GetPaging(currentIndex, pageSize, 0)
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
 	var condition string
 	var pars []interface{}
 
@@ -170,6 +179,16 @@ func (this *YanxuanSpecialNoLoginController) Detail() {
 		br.Ret = 408
 		return
 	}
+	var resp models.CygxYanxuanSpecialResp
+	// 高毅资产的联系人，有权限的行业也不能查看报告详情页。提示无权限页面
+	if user.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
+		resp.HasPermission = 3
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
 
 	specialId, _ := this.GetInt("Id", 0)
 
@@ -189,7 +208,7 @@ func (this *YanxuanSpecialNoLoginController) Detail() {
 		item.IsCollect = 1
 	}
 	item.Pv += item.HzPv // 添加弘则PV
-	var resp models.CygxYanxuanSpecialResp
+
 	resp.HasPermission = 1
 	resp.CygxYanxuanSpecialItem = *item
 	if item.DocUrl != "" {
@@ -1071,6 +1090,15 @@ func (this *YanxuanSpecialNoLoginController) AuthorList() {
 	}
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	resp := new(models.SpecialAuthorListResp)
+	if sysUser.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
+		resp.List = make([]*models.CygxYanxuanSpecialAuthorItem, 0)
+		resp.Paging = paging.GetPaging(currentIndex, pageSize, 0)
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
 	specialAuthorCheck := services.GetYanxuanSpecialAuthorInfo(sysUser) //用户是否没开通研选专栏以及，专栏信息是否完善
 	resp.IsAuthor = specialAuthorCheck.IsAuthor
 	resp.IsImproveInformation = specialAuthorCheck.IsImproveInformation