From e416ac6496d52be7ac416da33ea4395cf9bcc4e9 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 20 六月 2025 21:29:17 +0800
Subject: [PATCH] 修改uaid的空判断

---
 zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java |   10 +++++++---
 1 files changed, 7 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..61e8a8f 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;
 
@@ -24,9 +25,12 @@
 
     Boolean findByuid(Long uid, Long tfid);
 
+    List<ZInfoUser>  findByUaidToFaid(String usid);
     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 +51,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