From fbfde8292c1ab06ccd943ef4c7acfe3c0e4101a1 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 19:42:56 +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 | 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