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 | 9 ++++++--- 1 files changed, 6 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 3b2e60e..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; @@ -26,7 +27,9 @@ List<ZInfoUser> selectByClanId(Integer clanId); - List<ZInfoUser> getDataBySex(Integer sex); + AjaxResult findUserNameAClan(List<String> nickNames); + + List<ZInfoUser> getDataBySex(Integer sex,Integer clanId); public ZInfoUser getInfoBysysId(Long sysid); @@ -47,13 +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(); + AjaxResult listAllFamilyPeople(Integer clanId); AjaxResult listMySelfAndSpouse(Long id); -- Gitblit v1.9.1