diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index a4637c00e..612e47d9f 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -719,7 +719,7 @@ class AccountBasic extends Component {
             </Form.Item>
               
               {
-                (!filterDepartments || (filterDepartments && filterDepartments.length==0 ) 
+                filterDepartments != undefined && ( (filterDepartments && filterDepartments.length==0 ) 
                     || (departmentsName == '' && !this.state.department_id 
                         && (!departments || departments.length == 0) ))  && 
                 <div style={{marginLeft: '113px',height:"20px",lineHeight:"20px"}}>
diff --git a/public/react/src/modules/user/modal/ApplyForAddChildOrgModal.js b/public/react/src/modules/user/modal/ApplyForAddChildOrgModal.js
index be53dbdec..db32beed3 100644
--- a/public/react/src/modules/user/modal/ApplyForAddChildOrgModal.js
+++ b/public/react/src/modules/user/modal/ApplyForAddChildOrgModal.js
@@ -16,7 +16,7 @@ class ApplyForAddChildOrgModal extends Component{
   }
 
   componentDidUpdate=(prevState)=>{
-    if(this.props.departmentName && prevState.departmentName != this.props.departmentName){
+    if(prevState.departmentName != this.props.departmentName){
       this.setValue(this.props.departmentName)
     }
   }