diff --git a/src/forge/Information/Component/pointsDoc.jsx b/src/forge/Information/Component/pointsDoc.jsx index 7240effef..2069525ca 100644 --- a/src/forge/Information/Component/pointsDoc.jsx +++ b/src/forge/Information/Component/pointsDoc.jsx @@ -48,21 +48,21 @@ function PointsDoc({ visible , onCancel , onSure , type , username , choosed , h let res = await getMyTopArticle(member.zoneId); if(res && res.data.code === 200){ setCurrentRow(res.data.data); + let newId = null; if(res.data.data) { - setCurrentId(res.data.data.docId); - } else { - setCurrentId(null); + newId = res.data.data.docId; } - - await getMyNews(); + setCurrentId(newId); + await getMyNews(newId); } }finally{ setIsSpin(false) } } - async function getMyNews(){ - let result = await getNewsMyList(member.zoneId,{auditStatus:1, excludeId: currentId, pageSize:limit, pageNum:page}); + async function getMyNews(overrideId){ + const excludeId = overrideId !== undefined ? overrideId : currentId; + let result = await getNewsMyList(member.zoneId,{auditStatus:1, excludeId, pageSize:limit, pageNum:page}); let rows = result.data && result.data.rows; if(rows && rows.length>0){ setList(rows); diff --git a/src/forge/Information/Component/pointsProject.jsx b/src/forge/Information/Component/pointsProject.jsx index b18b972e3..528529d29 100644 --- a/src/forge/Information/Component/pointsProject.jsx +++ b/src/forge/Information/Component/pointsProject.jsx @@ -48,21 +48,21 @@ function PointsDoc({ visible , onCancel , onSure , type , username , choosed , h let res = await getMyTopProject(member.zoneId); if(res && res.data.code === 200){ setCurrentRow(res.data.data); + let newId = null; if(res.data.data) { - setCurrentId(res.data.data.id); - } else { - setCurrentId(null); + newId = res.data.data.id; } - - await getMyProject(); + setCurrentId(newId); + await getMyProject(newId); } }finally{ setIsSpin(false) } } - async function getMyProject(){ - let result = await getProjectMyList({zoneId: member.zoneId, auditStatus:1, excludeId: currentId, pageSize:limit, pageNum:page}); + async function getMyProject(overrideId){ + const excludeId = overrideId !== undefined ? overrideId : currentId; + let result = await getProjectMyList({zoneId: member.zoneId, auditStatus:1, excludeId, pageSize:limit, pageNum:page}); let rows = result.data && result.data.rows; if(rows && rows.length>0){ setList(rows);