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

lib/tasks/import_csv.rake

@@ -28,6 +28,7 @@ namespace :import do
       job_attributes[:company_id] = check_exist_or_create_company(company_attributes)
       job_attributes[:company_id] = check_exist_or_create_company(company_attributes)
       # Create job
       # Create job
       job = check_exist_or_create_job(job_attributes)
       job = check_exist_or_create_job(job_attributes)
+      if job.cities.count == 0 && job.industries.count == 0
         # Industry
         # Industry
         industry = check_exist_or_create_industry(row[1])
         industry = check_exist_or_create_industry(row[1])
         # Industry job
         # Industry job
@@ -38,6 +39,7 @@ namespace :import do
         job.cities << city
         job.cities << city
       end
       end
     end
     end
+  end
   
   
   def check_exist_or_create_company(company_attributes)
   def check_exist_or_create_company(company_attributes)
     find_company = Company.find_or_create_by(company_attributes)
     find_company = Company.find_or_create_by(company_attributes)