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 | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 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 ea7a36f..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,9 +1,13 @@
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;
-import com.ruoyi.domain.dto.EmpowerDto;
+
+import com.ruoyi.domain.dto.Genealogy;
+import com.ruoyi.domain.dto.GenealogyExportDto;
+import com.ruoyi.domain.dto.RelationDto;
import java.util.List;
@@ -19,9 +23,24 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+ Boolean findByuid(Long uid, Long tfid);
+
+ 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 searchMyRelation(Long userId);
+ AjaxResult removeByUserName(List<String> userName);
+ List<ZInfoUser> selectByFamId(long fid);
+ AjaxResult searchMyRelation();
AjaxResult addRelation(ZfRelation zfRelation);
@@ -29,6 +48,28 @@
AjaxResult deleteRelation(Long[] ids);
- AjaxResult empower(EmpowerDto empowerDto);
+// AjaxResult empower(EmpowerDto empowerDto);
+
+ 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);
+
+ List<Genealogy> selectByIds(Long[] ids);
+
+ List<Genealogy> selectDatas(List<GenealogyExportDto> params);
+
+ ZInfoUser getInfoById(Long userId);
+
+ ZInfoUser getMyself();
+
+ AjaxResult listGenealogy2(Genealogy genealogy, Integer pageNum, Integer pageSize);
}
--
Gitblit v1.9.1