From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 13 ++++++++++++-
1 files changed, 12 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..00e2113 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,16 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+
+
+ 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);
@@ -39,7 +47,7 @@
AjaxResult addParent(Long fatherId, Long motherId);
AjaxResult listAllExceptAdmin();
-
+ AjaxResult listAllFamilyPeople();
AjaxResult listMySelfAndSpouse(Long id);
AjaxResult listGenealogy(Genealogy genealogy,Integer pageNum,Integer pageSize);
@@ -51,4 +59,7 @@
ZInfoUser getInfoById(Long userId);
ZInfoUser getMyself();
+
+ AjaxResult listGenealogy2(Genealogy genealogy, Integer pageNum, Integer pageSize);
+
}
--
Gitblit v1.9.1