diff --git a/app/services/users/apply_authentication_service.rb b/app/services/users/apply_authentication_service.rb index f31bb335c..9e0901ef4 100644 --- a/app/services/users/apply_authentication_service.rb +++ b/app/services/users/apply_authentication_service.rb @@ -9,6 +9,8 @@ class Users::ApplyAuthenticationService < ApplicationService end def call + raise Error, '请先完善基本信息' unless user.profile_completed? + Users::ApplyAuthenticationForm.new(params).validate! raise Error, '您已经申请过实名认证了' if ApplyUserAuthentication.real_name_auth.processing.exists?(user_id: user.id) diff --git a/app/services/users/apply_professional_auth_service.rb b/app/services/users/apply_professional_auth_service.rb index 2d8279317..07afe18ae 100644 --- a/app/services/users/apply_professional_auth_service.rb +++ b/app/services/users/apply_professional_auth_service.rb @@ -9,6 +9,8 @@ class Users::ApplyProfessionalAuthService < ApplicationService end def call + raise Error, '请先完善基本信息' unless user.profile_completed? + Users::ApplyProfessionalAuthForm.new(params).validate! raise Error, '您已经申请过职业认证了' if ApplyUserAuthentication.professional_auth.processing.exists?(user_id: user.id) diff --git a/app/views/searchs/index.json.jbuilder b/app/views/searchs/index.json.jbuilder index a36edb5bd..5fa0c2744 100644 --- a/app/views/searchs/index.json.jbuilder +++ b/app/views/searchs/index.json.jbuilder @@ -5,6 +5,7 @@ json.results do json.type obj.class.name.downcase json.title highlights.delete(:name)&.join('...') || obj.searchable_title - json.description highlights.values[0,5].each { |arr| arr.is_a?(Array) ? arr.join('...') : arr }.join('
') + # json.description highlights.values[0,5].each { |arr| arr.is_a?(Array) ? arr.join('...') : arr }.join('
') + json.content highlights end end \ No newline at end of file