Merge branches 'dev_aliyun', 'develop' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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

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{

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);
     }
@@ -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 ? this.state.departments.filter(function(item){
         return item.name.indexOf(e) > -1
-      })
+      }) : []
       this.setState({
         filterDepartments:arr,
         departmentsName:e
@@ -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