Merge branch 'release/2.16.1.2410.01' into feature/权限
This commit is contained in:
commit
812ca6c752
|
|
@ -172,7 +172,7 @@ public class SalaryAcctSobConfigServiceImpl extends Service implements SalaryAcc
|
|||
}
|
||||
|
||||
@Override
|
||||
public void updateBySalaryAcctRecordId(Long salaryAcctRecordId) {
|
||||
public void updateBySalaryAcctRecordId(Long salaryAcctRecordId) {
|
||||
SalaryAcctRecordPO salaryAcctRecord = getSalaryAcctRecordService(user).getById(salaryAcctRecordId);
|
||||
if (salaryAcctRecord == null) {
|
||||
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(156474, "参数错误,薪资核算记录不存在或已被删除"));
|
||||
|
|
@ -185,10 +185,12 @@ public class SalaryAcctSobConfigServiceImpl extends Service implements SalaryAcc
|
|||
}
|
||||
getSalaryCacheService(user).set(SalaryCacheKey.ACCT_SOB_CONFIG + salaryAcctRecordId, "TRUE");
|
||||
|
||||
deleteBySalaryAcctRecordIds(Collections.singleton(salaryAcctRecordId));
|
||||
getSalaryAcctSobConfigMapper().insertIgnoreNull(salaryAcctSobConfig);
|
||||
|
||||
getSalaryCacheService(user).set(SalaryCacheKey.ACCT_SOB_CONFIG + salaryAcctRecordId, "FALSE");
|
||||
try {
|
||||
deleteBySalaryAcctRecordIds(Collections.singleton(salaryAcctRecordId));
|
||||
getSalaryAcctSobConfigMapper().insertIgnoreNull(salaryAcctSobConfig);
|
||||
} finally {
|
||||
getSalaryCacheService(user).set(SalaryCacheKey.ACCT_SOB_CONFIG + salaryAcctRecordId, "FALSE");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Reference in New Issue