From b23704a9660043ade4a4073c706cbc65ca9764c9 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 24 Jul 2019 14:08:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/department.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/models/department.rb b/app/models/department.rb
index bf5c3a90e..c019862db 100644
--- a/app/models/department.rb
+++ b/app/models/department.rb
@@ -3,8 +3,7 @@ class Department < ApplicationRecord
 
   has_many :department_members, dependent: :destroy
 
-  after_create_commit :reset_data_cache
-  after_update_commit :reset_data_cache
+  after_commit :reset_data_cache
 
   def self.cached_names_data(school)
     Rails.cache.fetch(names_data_cache_key(school.id), expires_in: 7.days) do
@@ -16,9 +15,7 @@ class Department < ApplicationRecord
 
   def reset_data_cache
     # 清除部门名称缓存
-    if new_record? || name_previously_changed?
-      Rails.cache.delete(self.class.names_data_cache_key(school_id))
-    end
+    Rails.cache.delete(self.class.names_data_cache_key(school_id))
   end
 
   def self.names_data_cache_key(school_id)

From d3eee68c74f7fafe9bce2c033efefa0223a64772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 24 Jul 2019 14:08:18 +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

---
 public/react/src/modules/user/Interestpage.js    | 6 +++---
 public/react/src/modules/user/InterestpageMax.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js
index 4c3c39406..b3abfe1a4 100644
--- a/public/react/src/modules/user/Interestpage.js
+++ b/public/react/src/modules/user/Interestpage.js
@@ -258,15 +258,15 @@ class InterestpageComponent extends Component {
 					<div className="ysldivhome1" >
           <div className="ysldivhomediv" style={{marginLeft:"30px"}} >
 					<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("teacher")}>{gouxuans ==="teacher"? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}老师</div>
-						<div className="ysldivhomedivimgsy" ><img src={skzbdx} className="ysldivhomedivimg"/></div>
+						<div className="ysldivhomedivimgsy" ><img onClick={()=>this.Clickteacher("teacher")} src={skzbdx} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" style={{ marginLeft:"101px",marginRight:"101px"}}>
 						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("student")}>{gouxuans==="student"? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}学生</div>
-						<div className="ysldivhomedivimgsy"><img src={mytc} className="ysldivhomedivimg"/></div>
+						<div className="ysldivhomedivimgsy"><img onClick={()=>this.Clickteacher("student")} src={mytc} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" >
 						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("professional")}>{gouxuans==="professional"?<img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}专业人士</div>
-						<div className="ysldivhomedivimgsy"><img src={zyrs1} className="ysldivhomedivimg"/></div>
+						<div className="ysldivhomedivimgsy"><img  onClick={()=>this.Clickteacher("professional")} src={zyrs1} className="ysldivhomedivimg"/></div>
           </div>
 					</div>
 					 <p className="yslspans2">选择你可能感兴趣的内容</p>
diff --git a/public/react/src/modules/user/InterestpageMax.js b/public/react/src/modules/user/InterestpageMax.js
index 82b3e7e0f..a53c1bbe0 100644
--- a/public/react/src/modules/user/InterestpageMax.js
+++ b/public/react/src/modules/user/InterestpageMax.js
@@ -260,15 +260,15 @@ class InterestpageMax extends Component {
 					<div className="ysldivhome12" >
 						<div className="ysldivhomediv222" style={{marginLeft:"30px"}} >
 							<div className="ysldivhomedivtxt2" onClick={()=>this.Clickteacher("teacher")}>{gouxuans ==="teacher"? <img src={gouxuan} className="gouxuanimg2"/>:<img className="gouxuanimg2" src={meigouxuan}/>}老师</div>
-							<div className="ysldivhomedivimg2" ><img src={skzbdx} className="ysldivhomedivimg2"/></div>
+							<div className="ysldivhomedivimg2"  ><img  onClick={()=>this.Clickteacher("teacher")} src={skzbdx} className="ysldivhomedivimg2"/></div>
 						</div>
 						<div className="ysldivhomediv222" style={{ marginLeft:"101px",marginRight:"101px"}}>
 							<div className="ysldivhomedivtxt2" onClick={()=>this.Clickteacher("student")}>{gouxuans==="student"? <img src={gouxuan} className="gouxuanimg2"/>:<img className="gouxuanimg2" src={meigouxuan}/>}学生</div>
-							<div className="ysldivhomedivimg2"><img src={mytc} className="ysldivhomedivimg2"/></div>
+							<div className="ysldivhomedivimg2"><img onClick={()=>this.Clickteacher("student")} src={mytc} className="ysldivhomedivimg2"/></div>
 						</div>
 						<div className="ysldivhomediv222" >
 							<div className="ysldivhomedivtxt2" onClick={()=>this.Clickteacher("professional")}>{gouxuans==="professional"?<img src={gouxuan} className="gouxuanimg2"/>:<img className="gouxuanimg2" src={meigouxuan}/>}专业人士</div>
-							<div className="ysldivhomedivimg2"><img src={zyrs1} className="ysldivhomedivimg2"/></div>
+							<div className="ysldivhomedivimg2"><img onClick={()=>this.Clickteacher("professional")} src={zyrs1} className="ysldivhomedivimg2"/></div>
 						</div>
 					</div>
 					<div><span className="yslspans22">选择你可能感兴趣的内容</span></div>

From 3ad752994112c4903b8d9a75c885515b136b280b Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Jul 2019 14:25:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E6=B5=8B?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/myshixuns_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 0a19f1c08..112b3352a 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -90,6 +90,7 @@ class MyshixunsController < ApplicationController
   # params[:pics] = "a.png,b.png,c.png"
   def training_task_status
 
+    logger.info("##################training_task_status_start#{jsonTestDetails['buildID']}")
     ActiveRecord::Base.transaction do
       begin
         t1 = Time.now