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

Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01

This commit is contained in:
Harryxzy 2024-09-19 17:50:09 +08:00
parent db064863b2 31d2994a9a
commit 2b7b61745a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,13 @@ public class VariableArchiveServiceImpl extends Service implements VariableArchi
//排序配置
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
queryParam.setOrderRule(orderRule);
return getVariableArchiveMapper().list(queryParam);
return listDTO(queryParam);
}
public List<VariableArchiveListDTO> listDTO(VariableArchiveQueryParam queryParam) {
List<VariableArchiveListDTO> list = getVariableArchiveMapper().list(queryParam);
SalaryI18nUtil.i18nList(list);
return list;
}
/**
@ -256,7 +262,7 @@ public class VariableArchiveServiceImpl extends Service implements VariableArchi
return Collections.emptyMap();
}
List<VariableArchiveListDTO> variableArchiveList = getVariableArchiveMapper().list(queryParam);
List<VariableArchiveListDTO> variableArchiveList = listDTO(queryParam);
// 获取所有浮动薪酬项目
List<VariableItemPO> variableItems = getVariableItemService(user).listAll();