From 9675064decbf5c0ebad5f1412d27c612dbfbea58 Mon Sep 17 00:00:00 2001 From: hshansha Date: Tue, 10 Jun 2025 16:54:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=87=BA=E5=8B=A4=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E3=80=81=E5=91=98=E5=B7=A5=E8=A1=A5=E8=B4=B4=E5=91=98?= =?UTF-8?q?=E5=B7=A5id=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/pay/mapper/PayRequireAttendanceReportMapper.java | 2 +- .../com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayRequireAttendanceReportMapper.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayRequireAttendanceReportMapper.java index 0ac4c93..a22732a 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayRequireAttendanceReportMapper.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayRequireAttendanceReportMapper.java @@ -16,7 +16,7 @@ import java.util.Map; * @date 2025-05-12 */ public interface PayRequireAttendanceReportMapper extends BaseMapperPlus { - @Select("SELECT `year`, `month` FROM pay_require_attendance_report WHERE tenant_id=#{tenantId} ORDER BY `year`,`month` DESC LIMIT 1") + @Select("SELECT `year`, `month` FROM pay_require_attendance_report WHERE tenant_id=#{tenantId} ORDER BY `year` DESC ,`month` DESC LIMIT 1") Map getLatestYearAndMonth(@Param("tenantId")Long tenantId); @Select("SELECT emp_name AS `name`, avtive_days AS value FROM pay_require_attendance_report " + diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java index 80eec9d..3ca0afa 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java @@ -72,6 +72,7 @@ public class PayEmployeeInfoServiceImpl implements IPayEmployeeInfoService { private LambdaQueryWrapper buildQueryWrapper(PayEmployeeInfoBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getId() != null, PayEmployeeInfo::getId, bo.getId()); lqw.eq(bo.getTenantId() != null, PayEmployeeInfo::getTenantId, bo.getTenantId()); lqw.eq(bo.getUserId() != null, PayEmployeeInfo::getUserId, bo.getUserId()); lqw.eq(bo.getDeptId() != null, PayEmployeeInfo::getDeptId, bo.getDeptId());