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

五院，字段排序

This commit is contained in:
钱涛 2025-11-28 15:22:30 +08:00
parent c16e7d3526
commit 6672dfdd69
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/WEB-INF/prop/hrmSalary.properties
View File

@ -1,5 +1,5 @@
log=false
defaultCloseNonStandard149=true
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
version=3.0.2.2510.01
version=3.0.3.2510.01.s
openFormulaForcedEditing=false

2
src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
View File

@ -141,7 +141,7 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
Map<Long, String> itemNameMap = SalaryEntityUtil.convert2LinkedMap(salaryItemPOList, SalaryItemPO::getId, SalaryItemPO::getName);
// 表格表头
List<WeaTableColumn> columns = itemNameMap.keySet().stream().map(itemId -> new WeaTableColumn("100px", itemNameMap.get(itemId), itemId.toString())).collect(Collectors.toList());
List<WeaTableColumn> columns = salaryItemIds.stream().map(itemId -> new WeaTableColumn("100px", itemNameMap.get(itemId), itemId.toString())).collect(Collectors.toList());
columns.add(0, new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "部门"), "departmentName"));