From b10f260189e5db5b89d9a85ce4fb08984d2aae2a Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期三, 20 十一月 2024 10:59:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 22 +++++++++++++++++++++- 1 files changed, 21 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..398efc6 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,23 @@ AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize); + Boolean findByuid(Long uid, Long tfid); + + List<ZInfoUser> selectByClanId(Integer clanId); + + AjaxResult findInfoUserNameAClan(String nickName); + + 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 +49,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 +68,7 @@ ZInfoUser getInfoById(Long userId); ZInfoUser getMyself(); + + AjaxResult listGenealogy2(Genealogy genealogy, Integer pageNum, Integer pageSize); + } -- Gitblit v1.9.1