From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/system/service/UserService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/system/service/UserService.java b/src/main/java/com/zy/crm/system/service/UserService.java
index 07d100f..393e4d1 100644
--- a/src/main/java/com/zy/crm/system/service/UserService.java
+++ b/src/main/java/com/zy/crm/system/service/UserService.java
@@ -8,8 +8,10 @@
public interface UserService extends IService<User> {
- Page<User> getPage(Page page, Long hostId, String deptId, Object username, Object mobile);
+ Page<User> getPage(Page<User> page, Long hostId, String deptId, Object username, Object mobile);
- List<User> getUserByDept(Long deptParentId);
+ List<User> getUserByDept(Long hostId, Long deptParentId);
+
+ User getDeptManager(Long hostId, Long deptId);
}
--
Gitblit v1.9.1