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

Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01

This commit is contained in:
Harryxzy 2023-06-09 09:48:56 +08:00
parent e24579f363 e464ca8ba6
commit 5bee0f3b4d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
View File

@ -158,6 +158,8 @@ public class SalaryItemBO {
.formulaId(salaryItemPO.getFormulaId())
.formulaContent(formulaMap.getOrDefault(salaryItemPO.getFormulaId(),""))
.taxDeclarationColumn(buildTaxDeclarationColumn(salaryItemPO.getCode()))
.canDelete(true)
.canEdit(openFormulaForcedEditing ||Objects.equals(salaryItemPO.getCanEdit(), NumberUtils.INTEGER_ONE))
.sortedIndex(salaryItemPO.getSortedIndex())
.description(salaryItemPO.getDescription())
.salaryItemType(salaryItemPO.getUseInEmployeeSalary() == 0 ? "薪资项目" : "档案字段")