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/mapper/UserMapper.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
index 210f2f9..3528749 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
@@ -26,6 +26,13 @@
List<User> selectUserCondition(@Param("ew") QueryWrapper<User> ew, @Param("type") String type);
/**
+ * 鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃锛堝寘鍚秴绾х鐞嗗憳锛�
+ * @param ew
+ * @return
+ */
+ List<User> selectUserConditionWithAdmin(@Param("ew") QueryWrapper<User> ew);
+
+ /**
* 鑾峰彇鐢ㄦ埛閮ㄩ棬
* @param userId
* @return
@@ -53,6 +60,12 @@
List<User> selectQualityUserList();
/**
+ * 鑾峰彇妫�娴嬪憳瑙掕壊浜哄憳淇℃伅
+ * @return
+ */
+ List<User> selectInspectorUserList();
+
+ /**
* 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
* @param userId
* @return
--
Gitblit v1.9.3