Merge remote-tracking branch 'origin/release/2.6.1.2301.02' into release/2.6.1.2301.02

This commit is contained in:
钱涛 2023-02-09 19:04:02 +08:00
commit 4186526743
1 changed files with 3 additions and 1 deletions

View File

@ -182,7 +182,9 @@ public class SalaryFieldWrapper extends Service {
*/
public void update(SalaryItemSaveParam saveParam) {
saveParam.setValueType(SalaryValueTypeEnum.INPUT.getValue());
saveParam.setUseInEmployeeSalary(NumberUtils.INTEGER_ONE);
if (null == saveParam.getUseInEmployeeSalary()) {
saveParam.setUseInEmployeeSalary(NumberUtils.INTEGER_ONE);
}
saveParam.setSystemType(SalarySystemTypeEnum.CUSTOM.getValue());
ValidUtil.doValidator(saveParam, RuntimeTypeEnum.UPDATE);