From dc7300e21fe53f74e08eb2fa494a83430e2e54ca Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 26 三月 2026 11:25:58 +0800
Subject: [PATCH] 绩效管理：人员考勤功能模块
---
ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java
index 0d8cac6..66e322a 100644
--- a/ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.system;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.User;
@@ -27,16 +28,15 @@
private UserService userService;
/**
- * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
- type : 2: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
+ *
* @param user
- * @param type
+ * @param type 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�,2: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
* @return
*/
@ApiOperation(value = "鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃")
@GetMapping("/selectUserCondition")
- public Result selectUserCondition(User user, String type){
- return Result.success(userService.selectUserCondition(user, type));
+ public Result selectUserCondition(User user, String type, Integer departmentId) {
+ return Result.success(userService.selectUserCondition(user, type, departmentId));
}
/**
@@ -71,6 +71,11 @@
return Result.success(userService.delUserDepardLimsId(id));
}
+ @ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴峰垪琛�")
+ @GetMapping("/selectAllUser")
+ public Result selectAllUser(){
+ return Result.success(userService.list(Wrappers.<User>lambdaQuery().eq(User::getStatus,0)));
+ }
}
--
Gitblit v1.9.3