From fb4e365f7e5fc0bebb3ba487d32dc9cceff0477d Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Fri, 30 May 2025 10:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B7=A5=E5=B7=A5=E6=97=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=9D=9E=E7=A9=BA=E9=AA=8C=E8=AF=81=E3=80=81=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/domain/vo/PayDayWorkHoursQuery2.java      | 15 +++++++++++++++
 .../service/impl/PayDayWorkHoursServiceImpl.java  |  3 +++
 2 files changed, 18 insertions(+)

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<Void> insertByBo(PayDayWorkHoursQuery2 payDayWorkHoursQuery2) {
         //先拆分员工 然后每个员工信息存储到SgrDayWorkHoursQuery集合中
         List<PayDayWorkHoursQuery>  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());