From e3e5d863f7da346e8beaed4fb6ed4a4fca0cb22b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期五, 05 五月 2023 10:22:56 +0800
Subject: [PATCH] 111
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index ca62533..ae53517 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -296,7 +296,7 @@
* @return
*/
@Override
- public AjaxResult listWithTree() {
+ public AjaxResult listWithTree(Integer depth) {
List<ZInfoUser> allPeopleList = list();
List<ZInfoUser> result = null;
@@ -341,6 +341,24 @@
}
+ @Override
+ public AjaxResult listMySelfAndSpouse(Long id) {
+ LambdaQueryWrapper<ZInfoUser> lqw1 = new LambdaQueryWrapper<>();
+ lqw1.eq(ZInfoUser::getUserId,id);
+ ZInfoUser myself = getOne(lqw1);
+ Long spouseId = myself.getSpouseId();
+
+ LambdaQueryWrapper<ZInfoUser> lqw2 = new LambdaQueryWrapper<>();
+ lqw2.eq(ZInfoUser::getUserId,spouseId);
+ ZInfoUser spouse = getOne(lqw2);
+
+ ArrayList<ZInfoUser> zInfoUsers = new ArrayList<>();
+ zInfoUsers.add(myself);
+ zInfoUsers.add(spouse);
+
+ return AjaxResult.success(zInfoUsers);
+ }
+
/**
* 閫掑綊绠楁硶
* @param people
@@ -348,7 +366,10 @@
* @return
*/
private List<ZInfoUser> fillChildren(ZInfoUser people, List<ZInfoUser> allPeopleList) {
- return allPeopleList.stream().filter(
+
+ // TODO: 2023-05-05 鎺у埗閫掑綊鐨勬鏁�
+
+ List<ZInfoUser> collect = allPeopleList.stream().filter(
one -> one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()
).map(
one -> {
@@ -357,6 +378,8 @@
}
).collect(Collectors.toList());
+ return collect;
+
}
--
Gitblit v1.9.1