From a667d977685c6eb66a4ba01feb7e810a8029c7a5 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 29 Jul 2015 15:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=85=B6=E4=BB=96=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=97=B6=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BB=96=E5=88=9B=E5=BB=BA=E7=9A=84=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 816a90ac3..0c5b441d4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -120,9 +120,9 @@ class UsersController < ApplicationController
     end
     projects = @user.projects.visible.order("updated_on desc")
     if(params[:status] == '1')
-      projects = projects.where("user_id = ?",@user.id)
+      projects = projects.where("projects.user_id = ?",@user.id)
     elsif(params[:status] == '2')
-      projects = projects.where("user_id <> ?",@user.id)
+      projects = projects.where("projects.user_id <> ?",@user.id)
     end
     @list = paginateHelper projects,10
     @params = params[:status]
@@ -261,17 +261,15 @@ class UsersController < ApplicationController
 
 # modified by fq
   def user_newfeedback
-    @jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
-    @jours.update_all(:is_readed => true, :status => false)
-    @jours.each do |journal|
+    jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    jours.update_all(:is_readed => true, :status => false)
+    jours.each do |journal|
       fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
     end
-    @jour = paginateHelper @jours,10
+    @jour = paginateHelper jours,10
     @state = false
-
     render :layout=>'base_users_new'
   end
- # end
 
   def user_comments