From 7d2330819e11cc505d3721373af34263f5c2fc16 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 二月 2025 17:54:30 +0800
Subject: [PATCH] Merge branch 'dev_zj' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 15 +++++++++++++++
1 files changed, 15 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 51b3929..f0dc2b3 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
@@ -6,6 +6,7 @@
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* 鐢ㄦ埛淇℃伅琛�
@@ -24,6 +25,20 @@
List<User> selectUserCondition(@Param("ew") QueryWrapper<User> ew, @Param("type") String type);
/**
+ * 鑾峰彇鐢ㄦ埛閮ㄩ棬
+ * @param userId
+ * @return
+ */
+ String selectUserDepartmentLimsName(@Param("userId") Integer userId);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鍜岄儴闂�
+ * @param participant
+ * @return
+ */
+ List<Map<String, String>> selectNameAnddepartment(@Param("participant") String participant);
+
+ /**
* 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
* @param userId
* @return
--
Gitblit v1.9.3