From 39363e9edaf0b6961e9ed6777a19aa929a4fba7d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 30 六月 2025 17:59:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/system/service/ISysUserService.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 48fad04..3ab96db 100644
--- a/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -344,4 +344,23 @@
      * @return 鐢ㄦ埛鍚�->鐪熷疄濮撳悕鐨勬槧灏勶紙涓嶅瓨鍦ㄦ椂鍊间负null锛�
 	 */
 	Map<String, String> getUserRealNamesByUserNames(List<String> userNames);
+
+
+	/**
+	 * 鏍规嵁鐝粍Id鏌ヨ
+	 * @param page
+	 * @param groupId 鐝粍id
+	 * @param username 鐢ㄦ埛璐︽埛鍚嶇О
+	 * @return
+	 */
+	IPage<SysUser> getUserByGroupId(Page<SysUser> page, String groupId, String username);
+
+	/**
+	 * 鏍规嵁浜х嚎Id鏌ヨ
+	 * @param page
+	 * @param factoryId 浜х嚎id
+	 * @param username 鐢ㄦ埛璐︽埛鍚嶇О
+	 * @return
+	 */
+	IPage<SysUser> getUserByFactoryId(Page<SysUser> page, String factoryId, String username);
 }

--
Gitblit v1.9.3