|
|
@@ -33,7 +33,7 @@ func GetTacticsList(endDate string) (list []*Tactics, err error) {
|
|
|
INNER JOIN article_content AS b ON a.id=b.article_id
|
|
|
INNER JOIN article_category AS c ON a.id=c.article_id
|
|
|
INNER JOIN article_categoryinfo AS d ON c.category_id=d.id
|
|
|
- WHERE a.publish_status=1 AND a.publish_date>=? AND d.id IN (28,32,45,50,57,62,72,74,79,84,86,88,90,95,96)
|
|
|
+ WHERE a.publish_status=1 AND a.publish_date>=? AND d.id IN (28,32,45,50,57,62,72,74,79,84,86,88,90,93,95,96,98)
|
|
|
AND a.id NOT IN (3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470) `
|
|
|
_, err = o.Raw(sql, endDate).QueryRows(&list)
|
|
|
return
|
|
|
@@ -47,7 +47,7 @@ func GetTacticsListAll() (list []*Tactics, err error) {
|
|
|
INNER JOIN article_content AS b ON a.id=b.article_id
|
|
|
INNER JOIN article_category AS c ON a.id=c.article_id
|
|
|
INNER JOIN article_categoryinfo AS d ON c.category_id=d.id
|
|
|
- WHERE a.publish_status=1 AND d.id IN (28,32,45,50,57,62,72,74,79,84,86,88,90,96)
|
|
|
+ WHERE a.publish_status=1 AND d.id IN (28,32,45,50,57,62,72,74,79,84,86,88,90,93,95,96,98)
|
|
|
AND a.id NOT IN (3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470) `
|
|
|
//IN(85,71)
|
|
|
_, err = o.Raw(sql).QueryRows(&list)
|
xingzai