From b93a030e667a48e00926d121ff9eb029de72f857 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 06 八月 2024 19:36:23 +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 | 29 ++++++++++++++++++++++++++---
1 files changed, 26 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 9803c8e..3b2e60e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -3,9 +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;
@@ -21,9 +22,22 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+ Boolean findByuid(Long uid, Long tfid);
+
+ List<ZInfoUser> selectByClanId(Integer clanId);
+
+ List<ZInfoUser> getDataBySex(Integer sex);
+
+ 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);
@@ -31,13 +45,15 @@
AjaxResult deleteRelation(Long[] ids);
- AjaxResult empower(EmpowerDto empowerDto);
+// AjaxResult empower(EmpowerDto empowerDto);
AjaxResult listWithTree(Integer depth);
AjaxResult addParent(Long fatherId, Long motherId);
AjaxResult listAllExceptAdmin();
+
+ AjaxResult listAllFamilyPeople();
AjaxResult listMySelfAndSpouse(Long id);
@@ -46,4 +62,11 @@
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