From 07d8f0087dffaa79a45b8a7e6afb067278ab9167 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 06 七月 2026 16:45:06 +0800
Subject: [PATCH] fix(attendance): 修复考勤配置查询和排班逻辑问题
---
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
index aa40835..73c78b5 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
@@ -1,17 +1,14 @@
package com.ruoyi.staff.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;
-import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.PersonalAttendanceLocationConfigService;
-import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -30,7 +27,7 @@
@RequiredArgsConstructor
public class PersonalAttendanceLocationConfigController {
- private PersonalAttendanceLocationConfigService personalAttendanceLocationConfigService;
+ private final PersonalAttendanceLocationConfigService personalAttendanceLocationConfigService;
@Operation(summary = "鏂板/淇敼浜哄憳鎵撳崱瑙勫垯閰嶇疆")
@PostMapping("/add")
@@ -47,7 +44,10 @@
@Operation(summary = "鍒嗛〉鏌ヨ浜哄憳鎵撳崱瑙勫垯閰嶇疆")
@GetMapping("/listPage")
public R listPage(Page page){
- return R.ok(personalAttendanceLocationConfigService.page(page));
+ page.addOrder(OrderItem.desc("id"));
+ return R.ok(personalAttendanceLocationConfigService.page(page,
+ new LambdaQueryWrapper<PersonalAttendanceLocationConfig>()
+ .ne(PersonalAttendanceLocationConfig::getId, 999)));
}
--
Gitblit v1.9.3