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

public/react/src/modules/user/modal/ApplyForAddChildOrgModal.js

@@ -76,7 +76,7 @@ class ApplyForAddChildOrgModal extends Component{
         {...this.props }
         onOk={this.onOk}
         okText="保存"
-        className="applyForModal courseNormalForm"
+        className="applyForModal courseNormalForm styleForapply"
       >
         <style>{`
           .applyForModal .ant-form-item-label {
@@ -86,7 +86,7 @@ class ApplyForAddChildOrgModal extends Component{
           .applyForModal .ant-form-item-label label {
             color: #979797
           }
-          .applyForModal .formItemInline .ant-form-item-control-wrapper {
+          .styleForapply .formItemInline .ant-form-item-control-wrapper {
             width: 390px;
           }
         `}</style>

public/react/src/modules/user/modal/RealNameCertificationModal.js

@@ -263,6 +263,7 @@ class RealNameCertificationModal extends Component{
   onSendOk = () => {
     this.props.form.validateFieldsAndScroll((err, values) => {
       console.log(values);
+      console.log(this.state.department_id);
       if(!err){
         let{imageUrl2}=this.state;
         let{current_user,basicInfo}=this.props;
@@ -424,6 +425,26 @@ class RealNameCertificationModal extends Component{
       })
     }
   }
+  // 选择部门、学院
+  changeDepartment=(e)=>{
+    let arr = this.state.departments && this.state.departments.filter ? this.state.departments.filter(function(item){
+      return item.name == e;
+    }) : [];
+    if (!arr[0]) {
+      this.setState({
+        department_id: '',
+        departmentsName: e,
+        filterDepartments: [],
+      })
+      this.this_department_id = ''
+      return;
+    }
+    this.this_department_id = arr[0].id
+    this.setState({
+      departmentsName:e,
+      department_id: arr[0].id,
+    })
+  }
 
   render(){
     const { course_lists, checkBoxValues, searchValue, loading, imageUrl, imageUrl2,
@@ -451,6 +472,7 @@ class RealNameCertificationModal extends Component{
       changeJob:this.changeJob,
       filterList:this.filterList,
       changeList:this.changeList,
+      changeDepartment:this.changeDepartment,
       showApplyForAddOrgModal:this.showApplyForAddOrgModal,
       showApplyForAddChildOrgModal:this.showApplyForAddChildOrgModal
     }