Merge branch 'develop' into feature/encrypt

This commit is contained in:
MustangDeng 2022-06-06 19:25:36 +08:00
commit a68de7d088
1 changed files with 7 additions and 1 deletions

View File

@ -35,6 +35,7 @@ import weaver.hrm.User;
import java.time.YearMonth;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
@ -216,7 +217,12 @@ public class SalarySobServiceImpl extends Service implements SalarySobService {
// 5保存
SalarySobItemBO.Result result = SalarySobItemBO.initSalarySobItem(salarySobPO.getId(), salarySobDefaultItemGroupPOS, salarySobDefaultItemPOS, defaultSalaryItemPOS, (long) user.getUID(), SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY);
if (CollectionUtils.isNotEmpty(result.getNeedInsertSalarySobItems())) {
salarySobItemService.batchInsert(result.getNeedInsertSalarySobItems());
List<SalarySobItemPO> list = new ArrayList<>(result.getNeedInsertSalarySobItems().stream()
.collect(Collectors.toMap(SalarySobItemPO::getSalaryItemId, Function.identity(), (oldValue, newValue) -> oldValue))
.values());
salarySobItemService.batchInsert(list);
}
if (CollectionUtils.isNotEmpty(result.getNeedInsertSalarySobItemGroups())) {
salarySobItemGroupService.batchInsert(result.getNeedInsertSalarySobItemGroups());