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 +++++++++++++++++++++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 12 ++++++++++--
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 5 +++++
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 3 ++-
4 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 86671ae..3fdc182 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -186,8 +186,8 @@
* 瀹舵牴缃�
*/
@GetMapping("/root")
- public AjaxResult listAllPeopleWithTree(){
- return zInfoUserService.listWithTree();
+ public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
+ return zInfoUserService.listWithTree(depth);
}
@@ -208,6 +208,14 @@
return zInfoUserService.addParent(fatherId,motherId);
}
+ /**
+ * 鏍规嵁鏈汉id鏌ヨ鏈汉淇℃伅浠ュ強閰嶅伓淇℃伅
+ */
+ @GetMapping("/listMyself/{id}")
+ public AjaxResult listMySelfAndSpouse(@PathVariable("id") Long id){
+ return zInfoUserService.listMySelfAndSpouse(id);
+ }
+
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 3d8e4af..96e5bbc 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -137,6 +137,11 @@
private String img;
/**
+ * 閰嶅伓id
+ */
+ private Long spouseId;
+
+ /**
* 鐖朵翰鐨刬d
*/
private Long fatherId;
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 9f39317..66fb383 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -31,10 +31,11 @@
AjaxResult empower(EmpowerDto empowerDto);
- AjaxResult listWithTree();
+ AjaxResult listWithTree(Integer depth);
AjaxResult addParent(Long fatherId, Long motherId);
AjaxResult listAllExceptAdmin();
+ AjaxResult listMySelfAndSpouse(Long id);
}
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