no message

controllers/cygx/user.go

@@ -694,7 +694,7 @@ func (this *UserController) TableList() {
 			{PermissionName: "专栏文章阅读记录", Source: 11, TotalNum: countDetail.YanxuanSpecialNum},
 			{PermissionName: "收藏的专栏文章", Source: 12, TotalNum: countDetail.YanxuanSpecialCollectNum},
 			{PermissionName: "关注的专栏作者", Source: 13, TotalNum: countDetail.YanxuanSpecialFollowNum},
-			{PermissionName: "搜索", Source: 7, TotalNum: 0}}
+			{PermissionName: "搜索", Source: 7, TotalNum: countDetail.KeyWordNum}}
 		resp.List = List
 	}
 
@@ -1088,13 +1088,18 @@ func (this *UserController) TableDetail() {
 			}
 		}
 	} else if source == 7 {
-		total, err = cygx.GetCygxSearchKeyWordCount(userId)
+		if classType == 1 {
+			condition += "  AND register_platform IN  (1,2)  "
+		} else {
+			condition += "  AND register_platform IN  (5,6)  "
+		}
+		total, err = cygx.GetCygxSearchKeyWordCount(userId, condition)
 		if err != nil {
 			br.ErrMsg = "获取信息失败，Err:" + err.Error()
 			br.Msg = "获取搜索记录失败"
 			return
 		}
-		list, err = cygx.GetCygxSearchKeyWordByUser(userId, startSize, pageSize)
+		list, err = cygx.GetCygxSearchKeyWordByUser(condition, userId, startSize, pageSize)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.ErrMsg = "获取信息失败，Err:" + err.Error()
 			br.Msg = "获取搜索记录列表失败"
@@ -2449,7 +2454,8 @@ func (this *UserController) CompanyTableList() {
 			{PermissionName: "关注的作者", Source: 6, TotalNum: departmentFollowNum},
 			{PermissionName: "专栏文章阅读记录", Source: 11, TotalNum: yanxuanSpecialNum},
 			{PermissionName: "收藏的专栏文章", Source: 12, TotalNum: yanxuanSpecialCollectNum},
-			{PermissionName: "关注的专栏作者", Source: 13, TotalNum: yanxuanSpecialFollowNum}}
+			{PermissionName: "关注的专栏作者", Source: 13, TotalNum: yanxuanSpecialFollowNum},
+			{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum}}
 		resp.List = List
 	}
 
@@ -5467,7 +5473,8 @@ func (this *UserController) TableCompanyList() {
 			{PermissionName: "关注的作者", Source: 6, TotalNum: departmentFollowNum},
 			{PermissionName: "专栏文章阅读记录", Source: 11, TotalNum: yanxuanSpecialNum},
 			{PermissionName: "收藏的专栏文章", Source: 12, TotalNum: yanxuanSpecialCollectNum},
-			{PermissionName: "关注的专栏作者", Source: 13, TotalNum: yanxuanSpecialFollowNum}}
+			{PermissionName: "关注的专栏作者", Source: 13, TotalNum: yanxuanSpecialFollowNum},
+			{PermissionName: "搜索", Source: 7, TotalNum: keyWordNum}}
 		resp.List = List
 	}
 	br.Ret = 200

models/cygx/cygx_user.go

@@ -785,21 +785,21 @@ func GetCygArticleDepartmentFollowByUser(uid, startSize, pageSize int) (items []
 }
 
 // 用户搜索关键词统计
-func GetCygxSearchKeyWordCount(uid int) (count int, err error) {
+func GetCygxSearchKeyWordCount(uid int, condition string) (count int, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_search_key_word  WHERE   user_id = ?  `
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_search_key_word  WHERE   user_id = ?  ` + condition
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
 }
 
 // 用户搜索关键词列表
-func GetCygxSearchKeyWordByUser(uid, startSize, pageSize int) (items []*UserInteraction, err error) {
+func GetCygxSearchKeyWordByUser(condition string, uid, startSize, pageSize int) (items []*UserInteraction, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			key_word,create_time
 		FROM
 			cygx_search_key_word as k
-			WHERE user_id = ?
+			WHERE user_id = ? ` + condition + `
 			ORDER BY  k.create_time DESC LIMIT ?,? `
 	_, err = o.Raw(sql, uid, startSize, pageSize).QueryRows(&items)
 	return
@@ -1167,7 +1167,7 @@ func GetUserInteractionTableCountByYanXuan(uid int) (item *GetUserInteractionTab
 			( SELECT COUNT( 1 ) FROM cygx_article_collect AS h  INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id  WHERE h.user_id = ?  AND art.article_type_id > 0   ) AS count_num,
 			( SELECT COUNT( 1 ) FROM cygx_industry_fllow AS h INNER JOIN   cygx_industrial_management  as   a  ON a.industrial_management_id  = h.industrial_management_id   WHERE h.user_id = ? AND h.type = 1  AND  h.source   IN (0,1,2)  AND a.chart_permission_id  = 31   ) AS industry_fllow_num,
 			( SELECT COUNT( 1 ) FROM cygx_article_department_follow AS h WHERE h.user_id = ?  AND h.type = 1  ) AS department_follow_num,
-			( SELECT COUNT( 1 ) FROM cygx_search_key_word AS h WHERE h.user_id = ?   AND  h.register_platform IN(1,2) ) AS key_word_num,
+			( SELECT COUNT( 1 ) FROM cygx_search_key_word AS h WHERE h.user_id = ?   AND  h.register_platform IN(5,6) ) AS key_word_num,
 			( SELECT 	COUNT( DISTINCT a.activity_id )  as count  FROM cygx_activity_signup_detail AS h INNER JOIN cygx_activity as a ON a.activity_id = h.activity_id  INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id   WHERE h.user_id = ? 
 					  AND t.activity_type=1 AND h.do_fail_type = 0  AND  a.chart_permission_id  = 31    ) AS on_line_num,
 			( SELECT  	COUNT( DISTINCT a.activity_id )  as count  FROM cygx_activity_signup_detail AS h INNER JOIN cygx_activity as a ON a.activity_id = h.activity_id  INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id   WHERE h.user_id = ?