From 7a838ed69de1d9593fe6b37f9b5caafb5f8d0cbf Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期一, 10 三月 2025 14:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryCorrectionHoursServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryCorrectionHoursServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryCorrectionHoursServiceImpl.java
index 3cc5139..9afc078 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryCorrectionHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryCorrectionHoursServiceImpl.java
@@ -45,7 +45,7 @@
@Override
public IPage<AuxiliaryCorrectionHoursDto> selectAuxiliaryCorrectionHours(Page page, AuxiliaryCorrectionHoursDto auxiliaryCorrectionHoursDto) {
- List<Long> ids = new ArrayList<>();
+ List<Integer> ids = new ArrayList<>();
String departLims = auxiliaryCorrectionHoursDto.getDepartLims();
auxiliaryCorrectionHoursDto.setDepartLims(null);
if (ObjectUtils.isNotEmpty(departLims)) {
@@ -63,7 +63,8 @@
if (ids.size() == 0) {
ids = null;
}
- return auxiliaryCorrectionHoursMapper.selectAuxiliaryCorrectionHours(page, QueryWrappers.queryWrappers(auxiliaryCorrectionHoursDto).eq("month", auxiliaryCorrectionHoursDto.getMonth()), ids);
+ return auxiliaryCorrectionHoursMapper.selectAuxiliaryCorrectionHours(page, QueryWrappers.queryWrappers(auxiliaryCorrectionHoursDto)
+ .eq("month", auxiliaryCorrectionHoursDto.getMonth()), ids);
}
//瀵煎叆涓婁紶
--
Gitblit v1.9.3