|
@@ -70,9 +70,9 @@ INNER JOIN user_record AS ur ON wu.user_id=ur.user_id
|
|
|
INNER JOIN company_report_permission AS e ON d.company_id=e.company_id
|
|
|
INNER JOIN chart_permission AS f ON e.chart_permission_id=f.chart_permission_id
|
|
|
INNER JOIN variety_tag AS g ON f.chart_permission_id=g.chart_permission_id
|
|
|
-WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND d.status IN('正式','试用','永续')
|
|
|
+WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND d.status IN('正式','试用','永续') AND e.status IN('正式','试用','永续')
|
|
|
AND g.variety_tag_id=?
|
|
|
ORDER BY FIELD(c.company_id, 16) DESC, ur.user_record_id ASC `
|
|
|
- err = global.DEFAULT_MYSQL.Raw(sql,varietyTagId).Scan(&items).Error
|
|
|
+ err = global.DEFAULT_MYSQL.Raw(sql, varietyTagId).Scan(&items).Error
|
|
|
return
|
|
|
-}
|
|
|
+}
|