From ae536b434f6eae2a64b4ce30cd8def726ff05a0a Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 22:47:02 +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 | 21 ++++++++++++++++++++-
1 files changed, 20 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 67ef1bc..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;
@@ -22,8 +23,24 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+ Boolean findByuid(Long uid, Long tfid);
+
+ List<ZInfoUser> findByUaidToFaid(String usid);
+ List<ZInfoUser> selectByClanId(Integer clanId);
+
+ AjaxResult findUserNameAClan(List<String> nickNames);
+
+ 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,12 +51,14 @@
// 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);
AjaxResult listGenealogy(Genealogy genealogy,Integer pageNum,Integer pageSize);
--
Gitblit v1.9.1