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 | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 d12a5fc..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,15 +22,20 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+ Boolean findByuid(Long uid, Long tfid);
+ List<ZInfoUser> selectByClanId(Integer clanId);
- public ZInfoUser getInfoBysysId(Long sysid);
+ List<ZInfoUser> getDataBySex(Integer sex);
+
+ public ZInfoUser getInfoBysysId(Long sysid);
+
AjaxResult getInfoByfid(Long fid);
// AjaxResult updateBySysId()
List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);
- AjaxResult removeByUserName(List userName);
+ AjaxResult removeByUserName(List<String> userName);
List<ZInfoUser> selectByFamId(long fid);
AjaxResult searchMyRelation();
@@ -42,12 +47,14 @@
// 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);
AjaxResult listGenealogy(Genealogy genealogy,Integer pageNum,Integer pageSize);
--
Gitblit v1.9.1