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

Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02

This commit is contained in:
Harryxzy 2023-07-19 11:51:50 +08:00
parent 959aa83a21 31a863c937
commit a144b88f6c
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/service/impl/SalarySendServiceImpl.java
View File

@ -664,6 +664,8 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
if (ObjectUtils.isEmpty(salarySendPO))
throw new SalaryRunTimeException("工资单不存在或已被删除");
List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySendPO.getSalarySobId()));
if(CollectionUtils.isEmpty(salaryTemplates))
throw new SalaryRunTimeException("请先设置工资单模板");
Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus();
if (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 0) {
// 默认为空时，未读未确认