Merge remote-tracking branch 'origin/master'

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<PayRequireAttendanceReportMapper, PayRequireAttendanceReport, PayRequireAttendanceReportVo> {
-    @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<String, String> getLatestYearAndMonth(@Param("tenantId")Long tenantId);
 
     @Select("SELECT emp_name AS `name`, avtive_days AS value FROM pay_require_attendance_report  " +

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java

@@ -72,6 +72,7 @@ public class PayEmployeeInfoServiceImpl implements IPayEmployeeInfoService {
     private LambdaQueryWrapper<PayEmployeeInfo> buildQueryWrapper(PayEmployeeInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PayEmployeeInfo> 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());