From b999398ae9b2719d2db15716dd353f7a3855d59e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 07 四月 2025 17:33:55 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
index 71fe3b3..bd66fa2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
@@ -38,7 +38,8 @@
switch (type) {
case "1":
- return baseMapper.selectQualityUserList();
+ List<User> userList = baseMapper.selectQualityUserList();
+ return userList;
case "2":
return baseMapper.selectDepartmentLimsUserList(SecurityUtils.getUserId().intValue());
}
--
Gitblit v1.9.3