Commit 521bd2ef authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents c4266a1a f23010aa
...@@ -100,7 +100,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -100,7 +100,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
leavePageCount = baseMapper.getLeavePageCount(employeeInfo); leavePageCount = baseMapper.getLeavePageCount(employeeInfo);
page.setTotal(leavePageCount); page.setTotal(leavePageCount);
if (leavePageCount > 0L) { if (leavePageCount > 0L) {
page.setPages((long) Math.ceil(leavePageCount / page.getSize())); page.setPages((long) Math.ceil(1.0*leavePageCount / page.getSize()));
} }
if (page.getCurrent() < 1) { if (page.getCurrent() < 1) {
page.setCurrent(1L); page.setCurrent(1L);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment