no message

controllers/cygx/user.go

@@ -738,7 +738,6 @@ func (this *UserController) TableDetail() {
 	if !checkSource {
 		source = 1
 	}
-	fmt.Println(source)
 	var total int
 	var condition string
 	var pars []interface{}

models/cygx/cygx_user.go

@@ -191,7 +191,7 @@ func GetCygxCompanyUserListSplit(userIds string) (items []*CygxCompanyUser, err
 			( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id  WHERE h.mobile = u.mobile AND h.is_del = 0   AND h.mobile <>'' ) AS history_num,
 			( SELECT COUNT( 1 ) FROM cygx_article_collect AS h WHERE h.user_id = u.user_id  ) AS count_num,
 			( SELECT COUNT( 1 ) FROM cygx_chart_collect AS h WHERE h.user_id = u.user_id  ) AS chart_num,
-			( SELECT COUNT( 1 ) FROM cygx_industry_fllow AS h WHERE h.user_id = u.user_id  AND h.type = 1  ) AS industry_fllow_num,
+			( SELECT COUNT( 1 ) FROM cygx_industry_fllow AS h WHERE h.user_id = u.user_id  AND h.type = 1  AND  h.source   IN (0,1,2)  ) AS industry_fllow_num,
 			( SELECT COUNT( 1 ) FROM cygx_article_department_follow AS h WHERE h.user_id = u.user_id  AND h.type = 1  ) AS department_follow_num,
 			( SELECT COUNT( 1 ) FROM cygx_search_key_word AS h WHERE h.user_id = u.user_id  ) AS key_word_num,
 			( SELECT  COUNT(DISTINCT h.activity_id) 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.mobile = u.mobile  
@@ -927,7 +927,7 @@ func GetUserInteractionTableCount(uid int) (item *GetUserInteractionTableCountRe
 			( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id  WHERE h.user_id = ?  AND h.is_del = 0 ) AS history_num,
 			( SELECT COUNT( 1 ) FROM cygx_article_collect AS h WHERE h.user_id = ? AND  h.article_id > 0  ) AS count_num,
 			( SELECT COUNT( 1 ) FROM cygx_chart_collect AS h INNER JOIN cygx_chart_all AS a ON h.chart_id = a.chart_id WHERE h.user_id = ?  ) AS chart_num,
-			( SELECT COUNT( 1 ) FROM cygx_industry_fllow AS h WHERE h.user_id = ? AND h.type = 1  ) AS industry_fllow_num,
+			( SELECT COUNT( 1 ) FROM cygx_industry_fllow AS h WHERE h.user_id = ? AND h.type = 1  AND  h.source   IN (0,1,2)  ) 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 = ?  ) 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 = ? 

models/cygx/cygx_user_company.go

@@ -331,7 +331,7 @@ func GetCygxArticleCollectByCompanyWeekly(startSize, pageSize int, condition str
 func GetCygxIndustryFllowCountByCompany(condition string) (count int, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industry_fllow AS r
-			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id WHERE   type = 1  ` + condition
+			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id WHERE   type = 1  AND  r.source   IN (0,1,2) ` + condition
 	err = o.Raw(sqlCount).QueryRow(&count)
 	return
 }
@@ -342,7 +342,7 @@ func GetCygxIndustryFllowCountByCompanyWeekly(condition string) (count int, err
 	databaseName := utils.GetWeeklyDatabase()
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industry_fllow AS r
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id
-			INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 WHERE   type = 1  `
+			INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 WHERE   type = 1  AND  r.source   IN (0,1,2)  `
 	sqlCount = fmt.Sprintf(sqlCount, databaseName)
 	if condition != "" {
 		sqlCount += condition
@@ -363,7 +363,7 @@ func GetCygxIndustryFllowByCompany(condition string, startSize, pageSize int) (i
 		FROM
 			cygx_industry_fllow AS r
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id 
-		WHERE  type = 1 ` + condition + ` ORDER BY  r.id DESC  LIMIT ?,? `
+		WHERE  type = 1 AND  r.source   IN (0,1,2) ` + condition + ` ORDER BY  r.id DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -384,7 +384,7 @@ func GetCygxIndustryFllowByCompanyWeekly(condition string, startSize, pageSize i
 			cygx_industry_fllow AS r
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id 
 			INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
-		WHERE  type = 1 `
+		WHERE  type = 1 AND  r.source   IN (0,1,2)  `
 	sql = fmt.Sprintf(sql, databaseName)
 	if condition != "" {
 		sql += condition
@@ -1022,7 +1022,7 @@ func GetCygxIndustryFllowByCompanyList(condition string, startSize, pageSize int
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT  JOIN cygx_user_interaction_num as ui  ON ui.user_id = r.user_id
 			
-		WHERE  type = 1 ` + condition + ` ORDER BY  r.create_time DESC  LIMIT ?,? `
+		WHERE  type = 1 AND  r.source   IN (0,1,2) ` + condition + ` ORDER BY  r.create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }

models/cygx/industry_fllow.go

@@ -50,6 +50,7 @@ func GetCygxIndustryFllowByUser(uid, startSize, pageSize int) (items []*UserInte
 		WHERE
 			user_id = ? 
 			AND type = 1 
+			AND f.source  IN (0,1,2)
 		ORDER BY
 			f.create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, uid, startSize, pageSize).QueryRows(&items)
@@ -59,7 +60,7 @@ func GetCygxIndustryFllowByUser(uid, startSize, pageSize int) (items []*UserInte
 // 关注产业数量
 func GetCygxIndustryFllowCount(uid int) (count int, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industry_fllow  WHERE   user_id = ?  AND type = 1  `
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industry_fllow  WHERE   user_id = ?  AND type = 1 AND  source   IN (0,1,2)  `
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
 }