From 7eaef1388b16ab8fc82218b3588480021f931882 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Thu, 18 Jul 2019 08:45:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=97=E5=8C=85=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 2 +-
 app/views/layouts/_unlogin_header.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 3998a9a5..3e4c08da 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -23,7 +23,7 @@
         <img class="roundedRectangles" src="/images/educoder/roundedRectangle.png"/>
       </li>
       <li class="<%= params[:controller] == "libraries" ? " active" : "" %>"><%= link_to "教学案例", libraries_path %></li>
-      <li class="<%= params[:controller] == "project_packages" ? " active" : "" %>"><%= link_to "众包", project_packages_path %></li>
+      <li class="<%= params[:controller] == "project_packages" ? " active" : "" %>"><%= link_to "众包任务", project_packages_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
       <% if User.current.ec_school.present? %>
         <li class="<%= ecs_controller.include?(params[:controller]) ? " active" : "" %>" id="ec_banner">
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 8263b5cd..b69a87ec 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -24,7 +24,7 @@
         <img class="roundedRectangles" src="/images/educoder/roundedRectangle.png"/>
       </li>
       <li class="<%= params[:controller] == "libraries" ? " active" : "" %>"><%= link_to "教学案例", libraries_path %></li>
-      <li class="<%= params[:controller] == "project_packages" ? " active" : "" %>"><%= link_to "众包", project_packages_path %></li>
+      <li class="<%= params[:controller] == "project_packages" ? " active" : "" %>"><%= link_to "众包任务", project_packages_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
     </ul>

From e115495effb048c54ad1e52bbd3e2d15f4ea0de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 18 Jul 2019 09:18:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/competitions/competitionsName.html.erb.html | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/views/competitions/competitionsName.html.erb.html b/app/views/competitions/competitionsName.html.erb.html
index 0ae6e2e6..e0248043 100644
--- a/app/views/competitions/competitionsName.html.erb.html
+++ b/app/views/competitions/competitionsName.html.erb.html
@@ -8,7 +8,6 @@
         bottom: 0px;
         right: 0px;
     }
-ddd
 </style>
 <div class="educontent newLogipopup" id="backImg" >
     <div class="pr edu-txt-center height-100 pt110">
@@ -18,15 +17,6 @@ ddd
                 <img src="/images/educoder/competitionslog.png" height="600px" width="600px" />
                 <img height="600px" width="600px" src="/images/educoder/applys.png" />
             </div>
-            <!--第三方账号登录-->
-            <!--<div class="mt10 edu-txt-center">
-              <p class="color-grey-9">第三方账号登录</p>
-              <div class="mt15">
-                <a href="javascript:void(0)" class="margin15"><img src="/images/educoder/weixin.png" class="radius"/></a>
-                <a href="javascript:void(0)" class="margin15"><img src="/images/educoder/QQ.png" class="radius"/></a>
-                <a href="javascript:void(0)" class="margin15"><img src="/images/educoder/weibo.png" class="radius"/></a>
-              </div>
-            </div>-->
         </div>
     </div>
 </div>

From 7b19036cb424f3c12e8c84b8fadb057c5ab4419e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 18 Jul 2019 09:25:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=88=98=E9=98=9F?=
 =?UTF-8?q?=E6=97=B6=E6=90=9C=E7=B4=A2=E7=94=A8=E6=88=B7=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=9C=A820=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/competition_teams_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/competition_teams_controller.rb b/app/controllers/competition_teams_controller.rb
index 5e76d263..06d504b2 100644
--- a/app/controllers/competition_teams_controller.rb
+++ b/app/controllers/competition_teams_controller.rb
@@ -51,7 +51,7 @@ class CompetitionTeamsController < ApplicationController
     end
 
     condition = "%#{params[:search].strip}%".gsub(" ","")
-    @teachers = User.joins(:user_extensions).where("status = 1 and LOWER(concat(lastname, firstname, login, nickname)) LIKE '#{condition}' and user_extensions.identity = 0")
+    @teachers = User.joins(:user_extensions).where("status = 1 and LOWER(concat(lastname, firstname, login, nickname)) LIKE '#{condition}' and user_extensions.identity = 0").limit(20)
   end
 
   def search_non_user
@@ -71,7 +71,7 @@ class CompetitionTeamsController < ApplicationController
     end
     user_ids = user_ids.length > 0 ? "(" + user_ids.uniq.join(',') +  ")" : "(-1)"
     condition = "%#{params[:search].strip}%".gsub(" ","")
-    @users = User.joins(:user_extensions).where("users.id not in #{user_ids} and status = 1 and user_extensions.identity = 1 and LOWER(concat(lastname, firstname, login, nickname)) LIKE '#{condition}'")
+    @users = User.joins(:user_extensions).where("users.id not in #{user_ids} and status = 1 and user_extensions.identity = 1 and LOWER(concat(lastname, firstname, login, nickname)) LIKE '#{condition}'").limit(20)
   end
 
   def create