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

Merge branch 'hotfix/1031' into release

This commit is contained in:
钱涛 2022-10-31 18:34:05 +08:00
parent 4d981a0aa0 78392b50dd
commit 4c1ccc1efb
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
View File

@ -466,7 +466,16 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
// queryParam.setTaxYearMonth(taxYearMonth.stream().map(e -> e + "-01 00:00:00").collect(Collectors.toList()));
// queryParam.setTaxYearMonthDate(taxYearMonth.stream().map(e -> e + "-01 00:00:00").map(SalaryDateUtil::dateStrToLocalTime).collect(Collectors.toList()));
// }
// 开启分权并且不是薪酬模块总管理员
List<AddUpSituationDTO> list = getAddUpSituationMapper().list(queryParam);
long employeeId = user.getUID();
if (getTaxAgentService(user).isOpenDevolution() && !getTaxAgentService(user).isChief(employeeId)) {
List<Long> taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList());
list = list.stream().filter(f ->
taxAgentIdsAsAdmin.contains(f.getTaxAgentId())
).collect(Collectors.toList());
}
// // 人员信息赋值
// list.forEach(m -> {
// // todo 身份证号