qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01

This commit is contained in:
Harryxzy 2023-09-21 15:06:04 +08:00
parent f4883ad87c 7a57849a25
commit bc7d7b3326
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/mapper/report/SalaryStatisticsPushMapper.java
View File

@ -79,5 +79,5 @@ public interface SalaryStatisticsPushMapper {
* @param reportId
* @return
*/
List<SalaryStatisticsPushPO> listByReportIdAndIds(@Param("reportId") Long reportId, @Param("ids") List<Long> ids);
List<SalaryStatisticsPushPO> listByReportIdAndIds(@Param("reportId") String reportId, @Param("ids") List<Long> ids);
}

2
src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
View File

@ -735,7 +735,7 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt
@Override
public List<SalaryStatisticsPushPO> getPushListByReportIdAndIds(Long reportId, List<Long> ids) {
List<SalaryStatisticsPushPO> pushList = getSalaryStatisticsPushMapper().listByReportIdAndIds(reportId, ids);
List<SalaryStatisticsPushPO> pushList = getSalaryStatisticsPushMapper().listByReportIdAndIds(reportId.toString(), ids);
pushList = pushList.stream().filter( push -> {
return Arrays.asList(push.getReportIds().split(",")).contains(reportId.toString());
}).collect(Collectors.toList());