xingzai 2 tahun lalu
induk
melakukan
ef3b6dd0e7
2 mengubah file dengan 9 tambahan dan 7 penghapusan
  1. 2 6
      controllers/article.go
  2. 7 1
      controllers/home.go

+ 2 - 6
controllers/article.go

@@ -98,6 +98,8 @@ func (this *ArticleController) Detail() {
 		}
 	}
 
+	fmt.Println("2342")
+
 	//HasPermission int `description:"1:有该行业权限,正常展示,2:无该行业权限,不存在权益客户下(ficc),3:无该品类权限,已提交过申请,4:无该品类权限,未提交过申请,5:潜在客户,未提交过申请,6:潜在客户,已提交过申请"`
 	if user.CompanyId > 1 {
 		companyPermission, err := models.GetCompanyPermission(user.CompanyId)
@@ -221,12 +223,6 @@ func (this *ArticleController) Detail() {
 			detail.Seller.SellerMobile = sellerItem.Mobile
 			detail.Seller.SellerName = sellerItem.RealName
 		}
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取销售数据失败,Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
-			return
-		}
-
 		//作者头像
 		if detail.DepartmentId > 0 {
 			departmentDetail, err := models.GetArticleDepartmentDateilById(detail.DepartmentId)

+ 7 - 1
controllers/home.go

@@ -284,7 +284,9 @@ func (this *MobileHomeController) NewList() {
 	pars = append(pars, time.Now().AddDate(0, 0, 30))
 
 	if user.CompanyId <= 1 {
-
+		condition += " AND source IN ('roadshow','article','newchart') "
+		startSize = 0
+		pageSize = utils.PageSize5
 	}
 	total, err := models.GetResourceDataCount(condition, pars)
 	if err != nil {
@@ -293,6 +295,10 @@ func (this *MobileHomeController) NewList() {
 		return
 	}
 
+	if user.CompanyId <= 1 {
+		total = utils.PageSize5
+	}
+
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	//Source      string    `description:"资源类型 报告 :article 、图表 :newchart、微路演 :roadshow、活动 :activity、活动视频:activityvideo、活动音频:activityvoice、专项调研活动:activityspecial"`
 	list, err := services.GetResourceDataList(condition, pars, startSize, pageSize, user)