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

public/react/src/modules/courses/busyWork/CommonWorkQuestion.js

@@ -87,7 +87,7 @@ class CommonWorkQuestion extends Component{
         
         {/* 内容区 */}
         <div className="padding40 memoContent new_li">
-          <MarkdownToHtml content={description}></MarkdownToHtml>
+          <MarkdownToHtml content={description} selector="work_content"></MarkdownToHtml>
 
           { attachments && attachments.map((item) => {
             return ( <div className="color-grey">

public/react/src/modules/user/account/AccountBasicEdit.js

@@ -402,6 +402,7 @@ class AccountBasic extends Component {
       filterDepartments,
       school,
       school_id,
+      departments,
       departmentsName,
       identity
     }=this.state;
@@ -718,7 +719,9 @@ class AccountBasic extends Component {
             </Form.Item>
               
               {
-                (!filterDepartments || (filterDepartments && filterDepartments.length==0 ) || (departmentsName == '' && !this.state.department_id))  && 
+                (!filterDepartments || (filterDepartments && filterDepartments.length==0 ) 
+                    || (departmentsName == '' && !this.state.department_id 
+                        && (!departments || departments.length == 0) ))  && 
                 <div style={{marginLeft: '113px',height:"20px",lineHeight:"20px"}}>
                   <span>
                     <span style={{color: '#CDCDCD'}}>{departmentsName ? `未找到包含“${departmentsName}”的院系/部门` : '未找到院系'}，</span>