From f0792fca6d0874de97411af39c4d58d0c120412f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:15:16 +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 | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 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..398efc6 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -3,7 +3,10 @@
import com.ruoyi.common.core.domain.AjaxResult;
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 +22,24 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+ Boolean findByuid(Long uid, Long tfid);
+
+ List<ZInfoUser> selectByClanId(Integer clanId);
+
+ AjaxResult findInfoUserNameAClan(String nickName);
+
+ 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 +47,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