|
|
@@ -1779,7 +1779,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
@Override
|
|
|
public List<outPublicReleaseLog> listPublicReleaseLog(Integer id,String ufid) {
|
|
|
- List<outPublicReleaseLog> list=publicReleaseLogMapper.listPublicReleaseLog(id,ufid);
|
|
|
+ List<outPublicReleaseLog> list=new ArrayList<>();
|
|
|
+ List<outPublicReleaseLog> log=publicReleaseLogMapper.listPublicReleaseLog(id,ufid);
|
|
|
PublicRelease e = publicReleaseMapper.queryById(id);
|
|
|
List<PublicExamine> publicExamines = publicExamineMapper.selectByPrid(id);
|
|
|
if (e.getStatus()==1){
|
|
|
@@ -1835,6 +1836,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ list.addAll(log);
|
|
|
return list;
|
|
|
}
|
|
|
|