Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/poll/PollDetailIndex.js

@@ -123,7 +123,7 @@ class PollDetailIndex extends Component{
 				/>
 				<div className="educontent mt10 mb50">
 					<p className="clearfix mb20">
-						<WordsBtn style="grey" className="fl" to={current_user.first_category_url}>{this.props.coursedata.name}</WordsBtn>
+						<WordsBtn style="grey" className="fl" to={current_user && current_user.first_category_url}>{this.props.coursedata.name}</WordsBtn>
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 						<WordsBtn style="grey" className="fl" to={`/courses/${this.props.match.params.coursesId}/polls/${user_permission && user_permission.left_banner_id}`}>问卷</WordsBtn>
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>

public/react/src/modules/courses/poll/PollNew.js

@@ -2322,7 +2322,7 @@ class PollNew extends Component {
 	gotohome=()=>{
 		const { current_user} = this.props
 
-		this.props.history.push(current_user.first_category_url);
+		this.props.history.push(current_user && current_user.first_category_url);
 		
 
 		// let courseId=this.props.match.params.coursesId;