change sql

diaryCandidateSet.py

@@ -45,8 +45,9 @@ def get_eachCityDiaryTop2000():
     cityList = get_cityList()
     allCitiesTop2000 = get_allCitiesDiaryTop2000()
     for i in cityList:
-        sql = "select '{0}',cid from data_feed_click " \
-              "where cid_type = 'diary' group by cid order by max(click_count_choice) desc limit 2000".format(i)
+        sql = "select city_id,cid from data_feed_click " \
+              "where cid_type = 'diary' and city_id = '{0}' group by cid " \
+              "order by max(click_count_choice) desc limit 2000".format(i)
         data = con_sql(sql)
         data = data.rename(columns={0: "city_id", 1: "cid"})
         data = filter_cid(data)