Merge branch 'release/3.0.2.2504.01' into release/个税&业务线

# Conflicts:
#	src/com/engine/salary/service/impl/PushServiceImpl.java

src/com/engine/salary/service/impl/PushServiceImpl.java

@@ -112,16 +112,16 @@ public class PushServiceImpl extends Service implements PushService {
         Map<Long, SalarySobPO> sobPOMap = SalaryEntityUtil.convert2Map(salarySobPOS, SalarySobPO::getId);
 
         List<PushSettingDTO> list = pushSettingPOS.stream()
-                .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName())).map(
+                .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName()))
-                        po -> PushSettingDTO.builder()
+                .map(po -> PushSettingDTO.builder()
-                                .id(po.getId())
+                        .id(po.getId())
-                                .name(po.getName())
+                        .name(po.getName())
-                                .tableName(po.getTableName())
+                        .tableName(po.getTableName())
-                                .modeName(po.getModeName())
+                        .modeName(po.getModeName())
-                                .modeId(po.getModeId())
+                        .modeId(po.getModeId())
-                                .able(po.getAble())
+                        .able(po.getAble())
-                                .salarySobs(po.getSalarySobIds().stream().map(sobPOMap::get).collect(Collectors.toList()))
+                        .salarySobs(po.getSalarySobIds().stream().map(sobPOMap::get).collect(Collectors.toList()))
-                                .build()).collect(Collectors.toList());
+                        .build()).collect(Collectors.toList());
         return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, PushSettingDTO.class);
     }
 
@@ -526,8 +526,9 @@ public class PushServiceImpl extends Service implements PushService {
     @Override
     public PageInfo<PushRecordDTO> recordList(RecordListQueryParam param) {
         List<PushRecordPO> pushRecordPOS = getPushRecordMapper().listAll();
-        List<PushRecordDTO> listDTOS = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pushRecordPOS)
+        List<PushRecordDTO> listDTOS = pushRecordPOS
                 .stream()
+                .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName()))
                 .map(po -> PushRecordDTO.builder()
                         .id(po.getId())
                         .name(po.getName())
@@ -543,9 +544,7 @@ public class PushServiceImpl extends Service implements PushService {
                         .build())
                 .collect(Collectors.toList());
 
-        PageInfo<PushRecordDTO> pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(),  PushRecordDTO.class);
+        PageInfo<PushRecordDTO> pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), listDTOS, PushRecordDTO.class);
-        pageInfo.setList(listDTOS);
-        pageInfo.setTotal(pushRecordPOS.size());
         return pageInfo;
     }