diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb
index a0f9f7fdd..463d9a6e3 100644
--- a/app/decorators/user_decorator.rb
+++ b/app/decorators/user_decorator.rb
@@ -14,12 +14,14 @@ module UserDecorator
 
   # 关注数
   def follow_count
-    User.watched_by(id).count
+    Watcher.where(user_id: id, watchable_type: %w(Principal User)).count
+    # User.watched_by(id).count
   end
 
   # 粉丝数
   def fan_count
-    watchers.count
+    Watcher.where(watchable_type: %w(Principal User), watchable_id: id).count
+    # watchers.count
   end
 
   # 是否绑定邮箱