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

薪资回算sendStatus值update漏写

This commit is contained in:
Harryxzy 2023-01-14 13:59:13 +08:00
parent 57753bfb4a
commit dc3bd34e0f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml
View File

@ -131,6 +131,9 @@
<if test="tenantKey != null">
tenant_key=#{tenantKey},
</if>
<if test="sendStatus != null">
send_status=#{sendStatus},
</if>
</set>
WHERE id = #{id} AND delete_type = 0
</update>

6
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -803,13 +803,13 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
}
SalarySendPO salarySend = mapper.getById(salarySendId);
if (salarySend == null) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100512, "工资单发放不存在"));
}
// 已经冻结不能操作
if (Objects.equals(salarySend.getSendStatus() , NumberUtils.INTEGER_ONE)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "工资单已冻结"));
}
if (salarySend == null) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100512, "工资单发放不存在"));
}
// 获取默认模板
List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySend.getSalarySobId()));
if (CollectionUtils.isEmpty(salaryTemplates)) {