diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursQuery2.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursQuery2.java index 2fb0683..d408cdb 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursQuery2.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayDayWorkHoursQuery2.java @@ -27,6 +27,12 @@ public class PayDayWorkHoursQuery2 { *//** 员工姓名 *//* @Excel(name = "员工姓名") private String empName;*/ + + /** + * 租户id + */ + private Long tenantId; + /** * 员工集合 */ @@ -103,6 +109,14 @@ public class PayDayWorkHoursQuery2 { this.note = note; } + public Long getTenantId() { + return tenantId; + } + + public void setTenantId(Long tenantId) { + this.tenantId = tenantId; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -111,6 +125,7 @@ public class PayDayWorkHoursQuery2 { .append("deptName", getDeptName()) .append("employeeId", getEmployeeId()) .append("empName", getEmpName())*/ + .append("tenantId", getTenantId()) .append("date", getDate()) .append("dwYearMonth", getDwYearMonth()) .append("note", getNote()) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java index dc5772d..1a68a51 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java @@ -103,6 +103,9 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { public R insertByBo(PayDayWorkHoursQuery2 payDayWorkHoursQuery2) { //先拆分员工 然后每个员工信息存储到SgrDayWorkHoursQuery集合中 List querys = new ArrayList<>(); + if(payDayWorkHoursQuery2.getEmpInfos()!=null&&payDayWorkHoursQuery2.getEmpInfos().size()>0){ + return R.fail("添加工时的员工为空!"); + } for(PayDayWorkEmps emp :payDayWorkHoursQuery2.getEmpInfos()){ PayDayWorkHoursQuery payDayWorkHoursQuery = new PayDayWorkHoursQuery(); payDayWorkHoursQuery.setEmpName(emp.getEmpName());