From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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..f7c4872 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.domain.ZInfoUser;
 import com.ruoyi.domain.ZfRelation;
 
@@ -22,8 +23,23 @@
 
     AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
 
+    Boolean findByuid(Long uid, Long tfid);
+
+    List<ZInfoUser> selectByClanId(Integer clanId);
+
+    AjaxResult findUserNameAClan(List<String> nickNames);
+
+    List<ZInfoUser> getDataBySex(Integer sex,Integer clanId);
+
+    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 +50,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 +69,7 @@
     ZInfoUser getInfoById(Long userId);
 
     ZInfoUser getMyself();
+
+    AjaxResult listGenealogy2(Genealogy genealogy, Integer pageNum, Integer pageSize);
+
 }

--
Gitblit v1.9.1