From cb8e3488bf11716bc5d3e5faf5b76392c366de72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Thu, 7 Mar 2024 08:51:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=91=E4=BC=A0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=B7=B3=E8=BD=AC=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/Group/GroupDetailSetting.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Team/Group/GroupDetailSetting.jsx b/src/forge/Team/Group/GroupDetailSetting.jsx index 168ba6ff..fedcc2a1 100644 --- a/src/forge/Team/Group/GroupDetailSetting.jsx +++ b/src/forge/Team/Group/GroupDetailSetting.jsx @@ -44,7 +44,7 @@ export default (props)=>{ return( - 团队设置} nav={array}> + 团队设置} nav={array} history={props.history}> From 139f6840c17ef9f4ce1ef68b3c555ebb5f3d56fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Thu, 7 Mar 2024 08:51:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9Enull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/tpm/TPMIndexHOC.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 22ec40fd..156240d5 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/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 + }) + } }) }