no message

controllers/cygx/user.go

@@ -2016,6 +2016,7 @@ func (this *UserController) ExportInteraction() {
 // @Title 机构互动详情table栏
 // @Description 互动详情table栏接口
 // @Param  CompanyId   query   int  true       "公司ID"
+// @Param  ClassType   query   int  true       "列表类型，1：权益，2：研选，默认1"
 // @Success 200 {object} cygx.UserRemarksListResp
 // @router /user/company/table/list [get]
 func (this *UserController) CompanyTableList() {
@@ -2032,6 +2033,7 @@ func (this *UserController) CompanyTableList() {
 		return
 	}
 	companyId, _ := this.GetInt("CompanyId")
+	classType, _ := this.GetInt("ClassType", 1)
 	if companyId < 1 {
 		br.Msg = "机构不存在"
 		return
@@ -2060,28 +2062,44 @@ func (this *UserController) CompanyTableList() {
 	//}
 
 	if isAdminRole {
-		historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCount(condition, pars)
+		conditionArtcile := condition       //文章搜索条件
+		conditionActivityMeet := condition  //活动到会搜索条件
+		conditionIndustryFllow := condition //产业关注搜索条件
+		conditionKeyWord := condition       //关键词记录搜索条件
+		if classType == 1 {
+			conditionArtcile += " AND art.article_type_id > 0  "
+			conditionActivityMeet += " AND a.chart_permission_id  != 31  "
+			conditionIndustryFllow += " AND m.chart_permission_id  != 31  "
+			conditionKeyWord += " AND r.register_platform IN (1,2)  "
+		} else {
+			conditionArtcile += " AND art.article_type_id = 0  "
+			conditionActivityMeet += " AND a.chart_permission_id  = 31  "
+			conditionIndustryFllow += " AND m.chart_permission_id  = 31  "
+			conditionKeyWord += " AND r.register_platform IN (5,6)  "
+		}
+
+		historyNum, err := cygx.GetCygxArticleAndYanxuanRecordCount(conditionArtcile, pars)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取用户阅读记录数量失败，Err:" + err.Error()
 			return
 		}
 
-		activityNum, err := cygx.GetActivityMeetByCompanyCount(condition)
+		activityNum, err := cygx.GetActivityMeetByCompanyCount(conditionActivityMeet)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取参会总数失败，Err:" + err.Error()
 			return
 		}
 		//获取用户收藏记录总数
-		articleCollect, err := cygx.GetCygxArticleCollectCountByCompany(condition)
+		articleCollect, err := cygx.GetCygxArticleCollectCountByCompany(conditionArtcile)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取用户收藏记录总数失败，Err:" + err.Error()
 			return
 		}
 		//获取用户关注总数
-		industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompany(condition)
+		industryFllowNum, err := cygx.GetCygxIndustryFllowCountByCompany(conditionIndustryFllow)
 		if err != nil {
 			br.Msg = "获取信息失败 "
 			br.ErrMsg = "获取用户关注总数失败，Err:" + err.Error()
@@ -2095,7 +2113,7 @@ func (this *UserController) CompanyTableList() {
 			return
 		}
 		//获取搜索记录
-		keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompany(condition)
+		keyWordNum, err := cygx.GetCygxSearchKeyWordCountBuCompany(conditionKeyWord)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()

models/cygx/article_and_yanxuan_record.go

@@ -26,7 +26,9 @@ type CygxArticleAndYanxuanRecordResp struct {
 // 获取数量
 func GetCygxArticleAndYanxuanRecordCount(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article_and_yanxuan_record as r WHERE 1= 1  `
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article_and_yanxuan_record as r
+                  INNER JOIN cygx_article  as art  ON  art.article_id = r.source_id 
+                  WHERE 1= 1  `
 	if condition != "" {
 		sqlCount += condition
 	}
@@ -39,6 +41,7 @@ func GetCygxArticleAndYanxuanRecordCountWeekly(condition string, pars []interfac
 	o := orm.NewOrmUsingDB("hz_cygx")
 	databaseName := utils.GetWeeklyDatabase()
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article_and_yanxuan_record as r 
+                             INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id
 				  INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
 		WHERE 1= 1  `
 	sqlCount = fmt.Sprintf(sqlCount, databaseName)