|
|
@@ -202,10 +202,10 @@ func GetCygxTagHistoryCountByCompanyIdCondition(condition string) (count int, er
|
|
|
|
|
|
// 获取列表
|
|
|
func GetCygxTagHistoryListBycondition(condition string, startSize, pageSize int) (list []*UserInteraction, err error) {
|
|
|
- sql := ` SELECT r.real_name,r.mobile,ci.tag_num,ui.tag_num AS ui_tag_num,r.company_name, r.create_time AS create_time,
|
|
|
+ sql := ` SELECT r.real_name,r.mobile,r.company_name, r.create_time AS create_time,
|
|
|
b.tag_id,b.tag_name,b.article_types,b.activity_types,b.industries,b.subject_names
|
|
|
FROM cygx_tag_history as r
|
|
|
- INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id
|
|
|
+ INNER JOIN cygx_tag AS b ON r.tag_id = b.tag_id
|
|
|
WHERE 1=1 `
|
|
|
if condition != "" {
|
|
|
sql += condition
|
xingzai