From b10f260189e5db5b89d9a85ce4fb08984d2aae2a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 20 十一月 2024 10:59:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index 3b2e60e..398efc6 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -26,7 +26,9 @@
List<ZInfoUser> selectByClanId(Integer clanId);
- List<ZInfoUser> getDataBySex(Integer sex);
+ AjaxResult findInfoUserNameAClan(String nickName);
+
+ List<ZInfoUser> getDataBySex(Integer sex,Integer clanId);
public ZInfoUser getInfoBysysId(Long sysid);
@@ -47,13 +49,13 @@
// AjaxResult empower(EmpowerDto empowerDto);
- AjaxResult listWithTree(Integer depth);
+ AjaxResult listWithTree(Integer depth, Integer clanId);
AjaxResult addParent(Long fatherId, Long motherId);
AjaxResult listAllExceptAdmin();
- AjaxResult listAllFamilyPeople();
+ AjaxResult listAllFamilyPeople(Integer clanId);
AjaxResult listMySelfAndSpouse(Long id);
--
Gitblit v1.9.1