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

港湾 优化

This commit is contained in:
Harryxzy 2025-01-05 15:40:50 +08:00
parent a3b9621ee4
commit b604dcea7d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -1867,14 +1867,14 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
List<GwPltxDt1PO> gwPltxDt1POS = getGwPltxDt1Service(user).listSome(GwPltxDt1PO.builder().mainid(param.getRequestId()).build());
// 获取能够管理的权限
List<pltxEmployeeDTO> pltxEmployeeDTOS = getSalaryAcctExcelService(user).pltxFilterData(PltxInitEmployeeParam.builder().txcj(param.getTxcj()).spr(param.getSpr()).build());
List<Long> canManageEmpIds = pltxEmployeeDTOS.stream().map(pltxEmployeeDTO::getEmployee).collect(Collectors.toList());
if (!isCreator && CollectionUtils.isEmpty(canManageEmpIds)) {
List<String> canManageEmps = pltxEmployeeDTOS.stream().map(DTO -> DTO.getGskjywr()+"_split"+DTO.getEmployee()).collect(Collectors.toList());
if (!isCreator && CollectionUtils.isEmpty(canManageEmps)) {
// 不是创建人也没有管理权限
return Collections.emptyList();
}
if (!isCreator) {
// 不是创建人,要分权
gwPltxDt1POS = gwPltxDt1POS.stream().filter(po -> canManageEmpIds.contains(Long.valueOf(po.getXm()))).collect(Collectors.toList());
gwPltxDt1POS = gwPltxDt1POS.stream().filter(po -> canManageEmps.contains(po.getGskjywr()+"_split"+po.getXm().toString())).collect(Collectors.toList());
}
Map<Long, DataCollectionEmployee> empMap = SalaryEntityUtil.convert2Map(getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ORG), DataCollectionEmployee::getEmployeeId);
@ -2038,9 +2038,9 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
Integer finalMainId = mainId;
// 处理明细表1,先根据主表id查,再根据姓名更新
List<UfTxjlgljmbDt1PO> dt1POS = getUfTxjlgljmbDt1Mapper().listSome(UfTxjlgljmbDt1PO.builder().mainid(mainId).build());
Map<Integer, UfTxjlgljmbDt1PO> dt1MapByXm = SalaryEntityUtil.convert2Map(dt1POS, UfTxjlgljmbDt1PO::getXm);
Map<String, UfTxjlgljmbDt1PO> dt1MapByXm = SalaryEntityUtil.convert2Map(dt1POS, po -> po.getGskjywr() + "_split" + po.getXm());
saveParam.getDt1().stream().forEach(dt1 -> {
UfTxjlgljmbDt1PO dt1PO = dt1MapByXm.get(dt1.getXm());
UfTxjlgljmbDt1PO dt1PO = dt1MapByXm.get(dt1.getGskjywr() + "_split" + dt1.getXm());
BigDecimal jbgzValue = (dt1.getJbgz() == null) ? new BigDecimal("0") : dt1.getJbgz();
BigDecimal dxValue = (dt1.getDx() == null) ? new BigDecimal("0") : dt1.getDx();
if (dt1PO == null) {