From b7680a7b61705798bbc1289d836f6d8337964c1b Mon Sep 17 00:00:00 2001
From: Bohung <bohung@rulingcom.com>
Date: Thu, 12 May 2022 15:35:53 +0800
Subject: [PATCH] Fix bug.

---
 app/controllers/admin/asks_controller.rb | 4 ++--
 app/helpers/admin/asks_helper.rb         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/asks_controller.rb b/app/controllers/admin/asks_controller.rb
index a8a1906..8db0cbb 100644
--- a/app/controllers/admin/asks_controller.rb
+++ b/app/controllers/admin/asks_controller.rb
@@ -103,7 +103,7 @@ class Admin::AsksController < OrbitAdminController
     @ask_setting = AskSetting.first
     @ask_setting = AskSetting.create() if @ask_setting.nil?
     @tags = @module_app.tags
-    @categories = @module_app.categories.enabled.sort_by{|category| (((module_app.asc rescue true) ? category.sort_number.to_i : -category.sort_number.to_i) rescue category.id)}
+    @categories = @module_app.categories.enabled.sort_by{|category| (((@module_app.asc rescue true) ? category.sort_number.to_i : -category.sort_number.to_i) rescue category.id)}
     @filter_fields = filter_fields(@categories, @tags)
     # 列表欄位
     @table_fields = [:situation, :category, 'title' , 'ask.name', 'ask.phone', 'ask.appointment','ask.created_at']
@@ -139,7 +139,7 @@ class Admin::AsksController < OrbitAdminController
   end
   def category_setting
     @default_ask_setting = AskSetting.first
-    @categories = current_user.approved_categories_for_module(@module_app).sort_by{|category| (((module_app.asc rescue true) ? category.sort_number.to_i : -category.sort_number.to_i) rescue category.id)}
+    @categories = current_user.approved_categories_for_module(@module_app).sort_by{|category| (((@module_app.asc rescue true) ? category.sort_number.to_i : -category.sort_number.to_i) rescue category.id)}
     @category_ids = @categories.collect(&:id)
     @category_titles = @categories.collect{|v| v.title}
 
diff --git a/app/helpers/admin/asks_helper.rb b/app/helpers/admin/asks_helper.rb
index 762c1e5..a18a666 100644
--- a/app/helpers/admin/asks_helper.rb
+++ b/app/helpers/admin/asks_helper.rb
@@ -18,7 +18,7 @@ module Admin::AsksHelper
     access_level = OrbitHelper.user_access_level?
     if access_level == "sub_manager"
       cats_relations = current_user.approved_categories_for_module(@module_app).map{|c| [c.id.to_s, c.title]}
-    else
+    elsif access_level && access_level != "user"
       cats = @module_app.categories.enabled
       cats_relations = [["",t(:all)]] + cats.map{|c| [c.id.to_s, c.title]}
     end