| | |
|---|
| | | private final EmpContractInfoMapper empContractInfoMapper; |
|---|
| | | private final FebsServerHrProperties properties; |
|---|
| | | private final IRemoteDeptService remoteDeptService; |
|---|
| | | private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser()) |
|---|
| | | .map(u -> u.getUserId().toString()) |
|---|
| | | .orElse("1"); |
|---|
| | | private final String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1"); |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) { |
|---|
| | |
|---|
| | | .filter(k -> DicCode.EMPTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEmpType())) |
|---|
| | | .findFirst() |
|---|
| | | .map(DicItem::getDicItemName) |
|---|
| | | .orElse("汉族")); |
|---|
| | | .orElse("正式工")); |
|---|
| | | // 设置民族 |
|---|
| | | p.setNationName(dicItems.stream() |
|---|
| | | .filter(k -> DicCode.NATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNation())) |
|---|
