From 484de03a039c3911367c88eeee64f3e8e35ef7b0 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 19 Jul 2019 11:36:37 +0800
Subject: [PATCH 1/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/controllers/colleges_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb
index fc62d664..4bc6cd87 100644
--- a/app/controllers/colleges_controller.rb
+++ b/app/controllers/colleges_controller.rb
@@ -67,7 +67,7 @@ class CollegesController < ApplicationController
                                                     user_extensions.`school_id`=#{@school.id}) and work_status between 1 and 2 and myshixun_id !=0").first.try(:sw_count)
 
     @teachers = User.find_by_sql("SELECT users.id, users.login, users.lastname, users.firstname, users.nickname, IFNULL((SELECT count(shixuns.id) FROM shixuns where shixuns.user_id =users.id group by shixuns.user_id), 0) AS publish_shixun_count,
-                                (SELECT count(c.id) FROM courses c, members m, member_roles mr WHERE c.id != 1309 and m.course_id = c.id AND m.id=mr.member_id AND mr.role_id in (3,7,9) AND m.user_id=users.id AND c.is_delete = 0) as course_count
+                                (SELECT count(c.id) FROM courses c, members m, member_roles mr WHERE c.id != 1309 and m.course_id = c.id AND m.id=mr.member_id AND mr.role_id in (3,7,9) and c.school_id = #{@school.id} AND m.user_id=users.id AND c.is_delete = 0) as course_count
                                 FROM `users`, user_extensions ue where users.id=ue.user_id and ue.identity=0 and ue.school_id=#{@school.id} ORDER BY publish_shixun_count desc, course_count desc, id desc LIMIT 10")
     # ).order("publish_shixun_count desc, experience desc").limit(10)
     @teachers =

From 3b39c43ef50e525e3c0d2b5e04727928694b627b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 19 Jul 2019 15:21:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E6=9D=AF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_returnTop_btn.html.erb  | 14 ++++++++++++--
 public/react/src/modules/tpm/SiderBar.js | 14 +++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_returnTop_btn.html.erb b/app/views/users/_returnTop_btn.html.erb
index 9bdc31d6..6ecc9e39 100644
--- a/app/views/users/_returnTop_btn.html.erb
+++ b/app/views/users/_returnTop_btn.html.erb
@@ -30,9 +30,19 @@
 
 </div>
 
-<div class="-task-sidebars" style="right: 240px !important;">
+<div id="trophyreturn" class="-task-sidebars" style="right: 65px !important;width: 154px;">
+  <a  onclick="trophyreturnfun();" id="closeIcon" style="position: absolute;right: 12px;top: 10px; color: #000;">
+    <i class="iconfont icon-shanchudiao"></i>
+  </a>
   <a href="/competitions">
     <img src="/images/educoder/competition/lvmeng.png" width="150px" height="150px">
   </a>
 
-</div>
\ No newline at end of file
+</div>
+
+<script>
+  function trophyreturnfun(){
+      $("#trophyreturn").hide()
+  }
+
+</script>
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index fd74c759..cb473f6d 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -14,7 +14,11 @@ class SiderBar extends Component {
         window._initSider();
         
     }
-
+	trophyreturnfun=()=>{
+    	this.setState({
+				trophyreturn:true
+			})
+	}
     render() {
         return (
 					<div>
@@ -51,11 +55,15 @@ class SiderBar extends Component {
 							</div>
 						</div>
 
-						<div className="-task-sidebars" style={{right: "240px"}}>
+						{this.state.trophyreturn===true?"":<div className="-task-sidebars" style={{right: "65x",width: "154px"}}>
+							<a onClick={this.trophyreturnfun} id="closeIcon"
+								 style={{position: "absolute", right: "12px",top:"10px",color: "#000"}}>
+								<i className="iconfont icon-shanchudiao"></i>
+							</a>
 							<a href="/competitions">
 								<img src={getImageUrl("images/educoder/competition/lvmeng.png")}  width="150px" height="150px" />
 							</a>
-						</div>
+						</div>}
 
 					</div>
             );

From 133cd637e1a453526ab79cf0217257391eb65ba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 19 Jul 2019 15:28:27 +0800
Subject: [PATCH 3/3] b

---
 public/react/src/modules/tpm/SiderBar.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index cb473f6d..aabc9640 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -7,7 +7,9 @@ const $ = window.$;
 class SiderBar extends Component {
     constructor(props) {
         super(props)
-
+			this.state = {
+				trophyreturn: false
+			}
     }
 
     componentDidMount() {