From bb871b5a770b41520fa9a028228c50a4241716b4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Nov 2016 17:57:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=20?=
 =?UTF-8?q?=E5=8D=9A=E5=AE=A2=20=E7=B2=89=E4=B8=9D=20=E5=85=B3=E6=B3=A8url?=
 =?UTF-8?q?=E7=9A=84id=E6=94=B9=E6=88=90=E7=99=BB=E5=BD=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 783aade75..b79e5864e 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -134,19 +134,19 @@
           </div>
           <ul class="user_atten clear">
             <li>
-              <a href="<%=user_blogs_path(:user_id => @user.id) %>">
+              <a href="<%=user_blogs_path(:user_id => @user) %>">
                 <strong>博客</strong><br />
                 <span class="sy_cgrey"><%=@user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %></span>
               </a>
             </li>
             <li>
-              <a href="<%=user_watchlist_user_path(@user.id) %>">
+              <a href="<%=user_watchlist_user_path(@user) %>">
                 <strong>关注</strong><br />
-                <span class="sy_cgrey"><%=User.watched_by(@user.id).count %></span>
+                <span class="sy_cgrey"><%=User.watched_by(@user).count %></span>
               </a>
             </li>
             <li>
-              <a href="<%=user_fanslist_user_path(@user.id) %>">
+              <a href="<%=user_fanslist_user_path(@user) %>">
                 <strong>粉丝</strong><br />
                 <span class="sy_cgrey"><%= @user.watcher_users.count %></span>
               </a>

From 561c96b48592119ad10f61b54f7696437ec5ff71 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Nov 2016 18:02:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9B=BE=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E4=B8=AD=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E7=BB=84=E7=BB=87=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E7=99=BB=E5=BD=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 1988dc672..db1e4f1cc 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -68,11 +68,11 @@
           </li>
           <% if hidden_unproject_infos %>
               <li>
-                <%= link_to '我的课程',{:controller => "users", :action => "user_courselist", :id => User.current.id}, :class => "menuGrey" %>
+                <%= link_to '我的课程',{:controller => "users", :action => "user_courselist", :id => User.current}, :class => "menuGrey" %>
               </li>
           <% end %>
           <li>
-            <%= link_to "我的组织",  user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
+            <%= link_to "我的组织",  user_organizations_user_path(:id => User.current), :class => "menuGrey"%>
           </li>
           <li>
             <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>