From 8429b26635252973e325d020af1a4485a0bbfdb0 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 28 八月 2024 11:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 cb9bd92..d9f78bd 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -22,8 +22,21 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+ Boolean findByuid(Long uid, Long tfid);
+
+ List<ZInfoUser> selectByClanId(Integer clanId);
+
+ List<ZInfoUser> getDataBySex(Integer sex);
+
+ public ZInfoUser getInfoBysysId(Long sysid);
+
+ AjaxResult getInfoByfid(Long fid);
+
+ // AjaxResult updateBySysId()
List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);
+ AjaxResult removeByUserName(List<String> userName);
+ List<ZInfoUser> selectByFamId(long fid);
AjaxResult searchMyRelation();
AjaxResult addRelation(ZfRelation zfRelation);
@@ -34,11 +47,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(Integer clanId);
AjaxResult listMySelfAndSpouse(Long id);
@@ -51,4 +66,7 @@
ZInfoUser getInfoById(Long userId);
ZInfoUser getMyself();
+
+ AjaxResult listGenealogy2(Genealogy genealogy, Integer pageNum, Integer pageSize);
+
}
--
Gitblit v1.9.1