From 92eb695ac1254708feb6e740432fc5da9e1ad42b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 08 七月 2026 15:37:12 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_山西_黎城康森商砼
---
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
index 73c78b5..d86ef0b 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
@@ -43,11 +43,17 @@
@Operation(summary = "鍒嗛〉鏌ヨ浜哄憳鎵撳崱瑙勫垯閰嶇疆")
@GetMapping("/listPage")
- public R listPage(Page page){
+ public R listPage(Page page, PersonalAttendanceLocationConfig query){
page.addOrder(OrderItem.desc("id"));
- return R.ok(personalAttendanceLocationConfigService.page(page,
- new LambdaQueryWrapper<PersonalAttendanceLocationConfig>()
- .ne(PersonalAttendanceLocationConfig::getId, 999)));
+ LambdaQueryWrapper<PersonalAttendanceLocationConfig> wrapper = new LambdaQueryWrapper<PersonalAttendanceLocationConfig>()
+ .ne(PersonalAttendanceLocationConfig::getId, 999);
+ if (query.getSysDeptId() != null) {
+ wrapper.eq(PersonalAttendanceLocationConfig::getSysDeptId, query.getSysDeptId());
+ }
+ if (query.getShift() != null && !query.getShift().isEmpty()) {
+ wrapper.eq(PersonalAttendanceLocationConfig::getShift, query.getShift());
+ }
+ return R.ok(personalAttendanceLocationConfigService.page(page, wrapper));
}
--
Gitblit v1.9.3