From 01a9d85aef5ed445acdc7f68798fa19efd480e2e Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 10 九月 2024 21:57:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 12 +++++++++---
1 files changed, 9 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 88d20d7..48db369 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -21,11 +21,15 @@
public interface ZInfoUserService extends IService<ZInfoUser> {
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+
Boolean findByuid(Long uid, Long tfid);
- List<ZInfoUser> getDataBySex(Integer sex);
+ List<ZInfoUser> selectByClanId(Integer clanId);
+
+ List<ZInfoUser> getDataBySex(Integer sex,Integer clanId);
public ZInfoUser getInfoBysysId(Long sysid);
+
AjaxResult getInfoByfid(Long fid);
// AjaxResult updateBySysId()
@@ -43,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