Merge branch 'feature-recommend3' into 'developer'

手动分页修改

See merge request !2899

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/contact/impl/ContactFollowServiceImpl.java

@@ -145,6 +145,7 @@ public class ContactFollowServiceImpl implements ContactFollowService {
         int totalPage = (int) Math.ceil((double) totalCount / pageSize);
 
         int fromIndex = Math.max((pageNum - 1) * pageSize, 0);
+        fromIndex = Math.min(fromIndex, list.size());
         int toIndex = Math.min(fromIndex + pageSize, totalCount);
         toIndex = Math.min(toIndex, list.size());