From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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..c362f0a 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
@@ -41,6 +41,10 @@
                     return baseMapper.selectQualityUserList();
                 case "2":
                     return baseMapper.selectDepartmentLimsUserList(SecurityUtils.getUserId().intValue());
+                case "3":
+                    return baseMapper.selectInspectorUserList();
+                case "4":
+                    return baseMapper.selectUserConditionWithAdmin(QueryWrappers.queryWrappers(user));
             }
 
         }

--
Gitblit v1.9.3