Merge branch 'master' of gitlab.zigexn.vn:phucth/ven-job into feature/solr_management

lib/tasks/import_csv.rake

@@ -28,14 +28,16 @@ namespace :import do
       job_attributes[:company_id] = check_exist_or_create_company(company_attributes)
       # Create job
       job = check_exist_or_create_job(job_attributes)
-      # Industry
-      industry = check_exist_or_create_industry(row[1])
-      # Industry job
-      job.industries << industry
-      # City
-      city = check_exist_or_create_city(row[16].gsub('["',"").gsub('"]',""))
-      # City job
-      job.cities << city
+      if job.cities.count == 0 && job.industries.count == 0
+        # Industry
+        industry = check_exist_or_create_industry(row[1])
+        # Industry job
+        job.industries << industry
+        # City
+        city = check_exist_or_create_city(row[16].gsub('["',"").gsub('"]',""))
+        # City job
+        job.cities << city
+      end
     end
   end