Merge branch 'dev_management' of https://gitlink.org.cn/Gitlink/forgeplus-react into dev_management

src/forge/Team/Group/GroupDetailSetting.jsx

@@ -44,7 +44,7 @@ export default (props)=>{
   return(
     <Box>
       <Short>
-        <Setnav header={<Title>团队设置</Title>} nav={array}></Setnav>
+        <Setnav header={<Title>团队设置</Title>} nav={array} history={props.history}></Setnav>
       </Short>
       <Long>
         <Gap>

src/modules/tpm/TPMIndexHOC.js

@@ -129,9 +129,11 @@ export function TPMIndexHOC(WrappedComponent) {
 			console.log(this.props.history.location);
 			getOrzCompanyList().then(res=>{
 				console.log(res);
-				this.setState({
-					companyList:res.data.rows
-				})
+				if(res){
+					this.setState({
+						companyList:res.data.rows
+					})
+				}
 			})
 		}