fix bugs

app/controllers/jobs_controller.rb

@@ -14,25 +14,28 @@ class JobsController < ApplicationController
 
 
   def city
   def city
     city = City.find(params[:city_id])
     city = City.find(params[:city_id])
-    @jobs = city.jobs.includes(:company).page(params[:page])
-    @result = "jobs/City/#{city.name}"
+    @jobs = city.jobs.includes(:company)
     @jobs_count = @jobs.count
     @jobs_count = @jobs.count
+    @jobs = @jobs.page(params[:page])
+    @result = "jobs/City/#{city.name}"
     render template: "jobs/job_lists"
     render template: "jobs/job_lists"
   end
   end
 
 
   def industry
   def industry
     industry = Industry.find(params[:industry_id])
     industry = Industry.find(params[:industry_id])
-    @jobs = industry.jobs.includes(:company).page(params[:page])
-    @result = "jobs/Industry/#{industry.name}"
+    @jobs = industry.jobs.includes(:company)
     @jobs_count = @jobs.count
     @jobs_count = @jobs.count
+    @jobs = @jobs.page(params[:page])
+    @result = "jobs/Industry/#{industry.name}"
     render template: "jobs/job_lists"
     render template: "jobs/job_lists"
   end
   end
 
 
   def company
   def company
     company = Company.find(params[:company_id])
     company = Company.find(params[:company_id])
-    @jobs = company.jobs.page(params[:page])
-    @result = "jobs/Company/#{company.name}"
+    @jobs = company.jobs
     @jobs_count = @jobs.count
     @jobs_count = @jobs.count
+    @jobs = @jobs.page(params[:page])
+    @result = "jobs/Company/#{company.name}"
     render template: "jobs/job_lists"
     render template: "jobs/job_lists"
   end
   end
 
 
@@ -42,8 +45,8 @@ class JobsController < ApplicationController
     response = query(condition)
     response = query(condition)
     job_id = response["response"]["docs"].pluck("id")
     job_id = response["response"]["docs"].pluck("id")
     @jobs = Job.where(id: job_id).includes(:company).page(params[:page])
     @jobs = Job.where(id: job_id).includes(:company).page(params[:page])
-    @result = params[:search]
     @jobs_count = job_id.count
     @jobs_count = job_id.count
+    @result = params[:search]
     render template: "jobs/job_lists"
     render template: "jobs/job_lists"
   end
   end