diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 078cf3eec..42f2d9d96 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -328,8 +328,8 @@ class ApplicationController < ActionController::Base
 
 	def current_user
 		# User.current
-		User.find_by_id 130328
-		# User.find_by_id 36390
+		# User.find_by_id 130328
+		User.find_by_id 36390
 		# nil
 	end
 
@@ -645,8 +645,15 @@ class ApplicationController < ActionController::Base
 	end
 
 	def find_project
-		@project = Project.find_by_identifier!(params[:id] || params[:project_id]) || (Project.find params[:project_id]) || (Project.find params[:id])
-    render_not_found("未找到’#{params[:id]}’相关的项目") unless @project
+		if params[:project_id].present?
+			@project = Project.find_by_identifier!(params[:project_id]) || (Project.find params[:project_id])
+		else
+			@project = Project.find_by_identifier!(params[:id]) || (Project.find params[:id])
+		end
+
+		# @project = Project.find_by_identifier!(params[:id] || params[:project_id]) || (Project.find params[:project_id]) || (Project.find params[:id])
+
+		render_not_found("未找到’#{params[:id]}’相关的项目") unless @project
 	end
 
 	def find_project_with_identifier