|
|
@@ -1313,8 +1313,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
Pagination<OutPublicDtails> page = (Pagination<OutPublicDtails>) findPage("listPublicDtails", "countPublicDtails", map, in.getPageNo(), in.getPageSize());
|
|
|
List<OutPublicDtails> list = (List<OutPublicDtails>)page.getList();
|
|
|
List<Integer> collect = list.stream().map(OutPublicDtails::getId).collect(Collectors.toList());
|
|
|
- List<PublicReleaseClock> publicReleaseClocks = publicReleaseClockMapper.selectList(collect);
|
|
|
- pushiClockInTime(list, publicReleaseClocks);
|
|
|
+ if (!collect.isEmpty()){
|
|
|
+ List<PublicReleaseClock> publicReleaseClocks = publicReleaseClockMapper.selectList(collect);
|
|
|
+ pushiClockInTime(list, publicReleaseClocks);
|
|
|
+ }
|
|
|
return page;
|
|
|
}
|
|
|
|