From 1cea71dd07fd9d183fcbbf87e0c534b146768f94 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 23 Jul 2019 11:18:35 +0800
Subject: [PATCH 1/5] 1440

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

diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 2beb9fa1b..e092c17d4 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -302,11 +302,12 @@ export function TPMIndexHOC(WrappedComponent) {
 		    	<div>
 
             <SiderBar Headertop={Headertop}/>
+            {/* 注释掉了1440 影响到了手机屏幕的展示 */}
 						<style>{
 							`
 							.newContainers{
 								width: 100%;
-								min-width: 1440px;
+								/*min-width: 1440px;*/
 							  max-width: unset;
 							}
 							// .-task-sidebar{

From 631afe88a658f5d3c90ef10d6b32386a02d9d250 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 23 Jul 2019 11:45:03 +0800
Subject: [PATCH 2/5] []

---
 public/react/src/modules/user/account/AccountBasicEdit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index d7dd3e566..3fc1094e4 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -201,9 +201,9 @@ class AccountBasic extends Component {
       this.props.form.setFieldsValue({
         org2:e
       })
-      let arr = this.state.departments.filter(function(item){
+      let arr = this.state.departments ? this.state.departments.filter(function(item){
         return item.name.indexOf(e) > -1
-      })
+      }) : []
       this.setState({
         filterDepartments:arr,
         departmentsName:e

From ef164e0abcf91e91ad0ab91c0a209ad4552335cf Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 23 Jul 2019 11:48:06 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E6=B2=A1=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8A=A5409?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b0183574d..81e9402b9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -34,10 +34,11 @@ class ApplicationController < ActionController::Base
 		User.current.admin? || User.current.business?
 	end
 
+	# 访问课堂时没权限直接弹加入课堂的弹框 ：409
 	def user_course_identity
 		@user_course_identity = current_user.course_identity(@course)
 		if @user_course_identity > Course::STUDENT && @course.is_public == 0
-			tip_exception(403, "您没有权限进入")
+			tip_exception(409, "您没有权限进入")
 		end
 		uid_logger("###############user_course_identity:#{@user_course_identity}")
 	end

From 6d0860d44ffaf11e993c591c68111e3e422d0632 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 23 Jul 2019 11:57:19 +0800
Subject: [PATCH 4/5] did

---
 public/react/src/modules/user/account/AccountBasicEdit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 3fc1094e4..432673bd2 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -37,7 +37,7 @@ class AccountBasic extends Component {
   }
 
   componentDidUpdate =(prevProps)=>{
-    if(this.props.basicInfo && prevProps.basicInfo == undefined){
+    if(this.props.basicInfo && (prevProps.basicInfo == undefined || prevProps.basicInfo.id != this.props.basicInfo.id)){
       this.setValue(this.props.basicInfo);
       this.getSchoolList(this.props.basicInfo);
     }

From d7a4b99380838e5c8d11b059432e0e8294524ab1 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 23 Jul 2019 12:02:18 +0800
Subject: [PATCH 5/5] filter

---
 public/react/src/modules/user/account/AccountBasicEdit.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 432673bd2..8af24022d 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -201,7 +201,7 @@ class AccountBasic extends Component {
       this.props.form.setFieldsValue({
         org2:e
       })
-      let arr = this.state.departments ? this.state.departments.filter(function(item){
+      let arr = this.state.departments && this.state.departments.filter ? this.state.departments.filter(function(item){
         return item.name.indexOf(e) > -1
       }) : []
       this.setState({
@@ -213,9 +213,9 @@ class AccountBasic extends Component {
 
   // 选择部门、学院
   changeDepartment=(e)=>{
-    let arr=this.state.departments.filter(function(item){
+    let arr=  this.state.departments && this.state.departments.filter ? this.state.departments.filter(function(item){
       return item.name == e;
-    });
+    }) : [];
     this.setState({
       departmentsName:e,
       department_id:arr[0].id