From 3ac5195d98526047062d8352a580a98d39813f66 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 26 二月 2025 13:52:44 +0800
Subject: [PATCH] 设施和环境条件代码迁移
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index 8a25b60..d9b9781 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -25,11 +25,38 @@
@Resource
private UserService userService;
+ /**
+ * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ type : 2: 鑾峰彇褰撳墠閮ㄩ棬(瀹為獙瀹や汉鍛�)
+ * @param user
+ * @param type
+ * @return
+ */
@ApiOperation(value = "鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃")
@GetMapping("/selectUserCondition")
public Result selectUserCondition(User user, String type){
return Result.success(userService.selectUserCondition(user, type));
}
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
+ * @return
+ */
+ @GetMapping("/getUserNow")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�")
+ public Result<?> getUserNow(){
+ return Result.success(userService.getUserNow());
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
+ * @return
+ */
+ @GetMapping ("/selectUserDepartmentLimsName")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬")
+ public Result<?> selectUserDepartmentLimsName(){
+ return Result.success("鎴愬姛", userService.selectUserDepartmentLimsName());
+ }
+
}
--
Gitblit v1.9.3