From a003c241e01d461c4b8ea4c8ea5ba70019cc5530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 26 Mar 2020 21:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=89=E6=8B=A9=E5=AD=A6?=
 =?UTF-8?q?=E6=A0=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/account/AccountBasicEdit.js  |  4 +-
 .../user/account/AccountBasicEditItem.js      | 40 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 7d6fc13d2..061336ed9 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -137,7 +137,7 @@ class AccountBasic extends Component {
 
   handleSubmit = () => {
     this.props.form.validateFieldsAndScroll({ force: true }, (err, values) => {
-      console.log(values);
+
       let {basicInfo}=this.props;
       if(!err ){
         if (!this.state.school_id) {
@@ -283,7 +283,7 @@ class AccountBasic extends Component {
 
   getDepartments=(e,flag)=>{
     let arr=this.state.schoolList.filter(function(item){
-      if(item.name.indexOf(e) > -1){
+      if(item.name===e){
         return item.name;
       }
     });
diff --git a/public/react/src/modules/user/account/AccountBasicEditItem.js b/public/react/src/modules/user/account/AccountBasicEditItem.js
index 9f362d973..88e7b6d92 100644
--- a/public/react/src/modules/user/account/AccountBasicEditItem.js
+++ b/public/react/src/modules/user/account/AccountBasicEditItem.js
@@ -8,10 +8,10 @@ class AccountBasicEditItem extends Component {
   constructor(props){
     super(props);
   }
-  
+
   render(){
-    let { 
-      professionalFlag , 
+    let {
+      professionalFlag ,
       getFieldDecorator ,
       identity ,
       filterSchoolList ,
@@ -32,7 +32,7 @@ class AccountBasicEditItem extends Component {
             {getFieldDecorator('job', {
               rules: [{
                 initialValue:"teacher",
-                required: true, 
+                required: true,
                 message: '请先选择职业',
               }],
             })(
@@ -45,7 +45,7 @@ class AccountBasicEditItem extends Component {
             </ConditionToolTip>
           </Form.Item>
           {
-            identity && identity=="student" && 
+            identity && identity=="student" &&
             <Form.Item
             label=""
             className="formItemInline fl"
@@ -55,7 +55,7 @@ class AccountBasicEditItem extends Component {
           <ConditionToolTip title={() => (<div><p>已提交职业认证</p><p>可在<a href="/account/certification" className="color-blue">认证信息</a>中通过“重新认证”进行修改</p></div>)} condition= { professionalFlag }>
             {getFieldDecorator('student_No', {
               rules: [{
-                required: true, 
+                required: true,
                 message: '请先输入学号',
               }],
             })(
@@ -65,7 +65,7 @@ class AccountBasicEditItem extends Component {
           </Form.Item>
           }
           {
-            identity && identity=="teacher" && 
+            identity && identity=="teacher" &&
             <Form.Item
               label=""
               className="formItemInline fl"
@@ -75,7 +75,7 @@ class AccountBasicEditItem extends Component {
               {getFieldDecorator('job1', {
                 rules: [{
                   initialValue:"教授",
-                  required: true, 
+                  required: true,
                   message: '请先选择职称',
                 }],
               })(
@@ -90,7 +90,7 @@ class AccountBasicEditItem extends Component {
             </Form.Item>
           }
           {
-            identity && identity=="professional" && 
+            identity && identity=="professional" &&
             <Form.Item
               label=""
               className="formItemInline fl mb0"
@@ -100,7 +100,7 @@ class AccountBasicEditItem extends Component {
               {getFieldDecorator('job2', {
                 rules: [{
                   initialValue:"企业管理者",
-                  required: true, 
+                  required: true,
                   message: '请先选择职称',
                 }],
               })(
@@ -125,7 +125,7 @@ class AccountBasicEditItem extends Component {
             rules: [{
               // initialValue: this.state.cityDefaultValue,
               // type: 'array',
-              required: true, 
+              required: true,
               message: '请先选择学校/单位',
 
               // 做不了，输入时和submit时都会执行这里
@@ -136,20 +136,20 @@ class AccountBasicEditItem extends Component {
               //   }
               //   callback('请先选择学校/单位');
               // }
-              
+
             }],
           })(
             <AutoComplete width={400} showSearch onSearch={this.props.filterList} onChange={this.props.changeList} disabled={professionalFlag}>
               {
                 filterSchoolList && filterSchoolList.map((item,key)=>{
-                  return(<Option value={item.name} key={item.id}>{item.name}</Option>)
+                  return(<Option value={item.name} key={key} id={item.id}>{item.name}</Option>)
                 })
               }
             </AutoComplete>
           )}
           </ConditionToolTip>
         </Form.Item>
-        
+
           {!filterSchoolList || (filterSchoolList && filterSchoolList.length==0 )&& school &&
             <div style={{marginLeft: '113px',height:"20px",lineHeight:"20px"}}>
               <span>
@@ -158,7 +158,7 @@ class AccountBasicEditItem extends Component {
               </span>
             </div>
           }
-        
+
           <Form.Item
             label="院系/部门"
             className="formItemInline mb0"
@@ -169,7 +169,7 @@ class AccountBasicEditItem extends Component {
                 rules: [{
                   // initialValue: this.state.cityDefaultValue,
                   // type: 'array',
-                  required: true, 
+                  required: true,
                   message: '请先选择院系/部门',
                   // validator: (rule, value, callback) => {
                   //   if (this.this_department_id) {
@@ -188,14 +188,14 @@ class AccountBasicEditItem extends Component {
                       )
                     })
                   }
-                </AutoComplete> 
+                </AutoComplete>
               )}
             </ConditionToolTip>
           </Form.Item>
           {
-            filterDepartments != undefined && ( (filterDepartments && filterDepartments.length==0 ) 
-                || (departmentsName == '' && ! department_id 
-                    && (!departments || departments.length == 0) ))  && 
+            filterDepartments != undefined && ( (filterDepartments && filterDepartments.length==0 )
+                || (departmentsName == '' && ! department_id
+                    && (!departments || departments.length == 0) ))  &&
             <div style={{marginLeft: '113px',height:"20px",lineHeight:"20px"}}>
               <span>
                 <span style={{color: '#CDCDCD'}}>{departmentsName ? `未找到包含“${departmentsName}”的院系/部门` : '未找到院系'}，</span>