diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index 6f96d11..9fe3c74 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -122,7 +122,7 @@ const StepOneComponent = (props) => { }; const getCorpInfoList = async (type, exCludeSelf) => { - const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000, eqType: type || 1, exCludeSelf: exCludeSelf || 1 }); + const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000, eqType: type || 1, exCludeSelf: exCludeSelf ?? 1 }); setCorpInfoList(data); }; diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index 6af18c3..3a0820d 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -824,14 +824,19 @@ const StepTwoComponent = forwardRef((props, ref) => { } }; const handleChooseFilsSubmit = (selectedRows) => { - const enterList = projectFileList.filter(item => !item.detailId); - const formattedRows = selectedRows.map(row => ({ + const existingIds = projectFileList + .filter(item => item.detailId) + .map(item => item.detailId); + const newRows = selectedRows.filter(row => + row.detailId && !existingIds.includes(row.detailId), + ); + const formattedRows = newRows.map(row => ({ ...row, existingFlag: 1, })); // 合并到现有列表中 - setProjectFileList([...enterList, ...formattedRows]); + setProjectFileList(prev => [...prev, ...formattedRows]); setChooseFilsListModalOpen(false); }; @@ -1029,8 +1034,8 @@ const ChooseFilsComponent = (props) => { } }, [props.data]); const handleRowSelectionChange = (selectedRowKeys, selectedRows) => { - setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]); - setSelectedRows([...selectedRows.filter(Boolean)]); + setSelectedRowKeys([...selectedRowKeys].filter(Boolean)); + setSelectedRows([...selectedRows].filter(Boolean)); }; return ( { } }; const handleChooseFilsSubmit = (selectedRows) => { - const enterList = projectFileList.filter(item => !item.detailId); - const formattedRows = selectedRows.map(row => ({ + const existingIds = projectFileList + .filter(item => item.detailId) + .map(item => item.detailId); + const newRows = selectedRows.filter(row => + row.detailId && !existingIds.includes(row.detailId), + ); + const formattedRows = newRows.map(row => ({ ...row, existingFlag: 1, })); // 合并到现有列表中 - setProjectFileList([...enterList, ...formattedRows]); + setProjectFileList(prev => [...prev, ...formattedRows]); setChooseFilsListModalOpen(false); }; @@ -763,8 +768,8 @@ const ChooseFilsComponent = (props) => { } }, [props.data]); const handleRowSelectionChange = (selectedRowKeys, selectedRows) => { - setSelectedRowKeys([...selectedRowKeys.filter(Boolean)]); - setSelectedRows([...selectedRows.filter(Boolean)]); + setSelectedRowKeys([...selectedRowKeys].filter(Boolean)); + setSelectedRows([...selectedRows].filter(Boolean)); }; return (