From f34203dacf5485b06d9d80618e5e14cf4463c2d7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:06 +0800
Subject: [PATCH] 修改了增加，修改用户代码
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 64af105..e7f008e 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
@@ -70,6 +70,25 @@
}
+ @Override
+ public ZInfoUser getInfoBysysId(Long sysid) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getSysId, sysid);
+ List<ZInfoUser> list = list(lqw);
+ return list.get(0);
+ }
+
+ @Override
+ public AjaxResult getInfoByfid(Long fid) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getFamilyId, fid);
+ lqw.eq(ZInfoUser::getIsMyFamily, 1L);
+ lqw.isNull(ZInfoUser::getSpouseId);
+ List<ZInfoUser> list = list(lqw);
+
+ return AjaxResult.success(list);
+ }
+
private LambdaQueryWrapper<ZInfoUser> buildCondition(ZInfoUser zInfoUser) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
@@ -366,7 +385,7 @@
// List<ZInfoUser> allPeopleList = list();
List<ZInfoUser> result = null;
try {
- result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && (people.getFatherId() == 0 || people.getMomId() == 0))
+ result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && ((people.getFatherId()!=null&&people.getFatherId() == 0) || (people.getMomId()!=null&&people.getMomId() == 0)))
.map(people -> {
if (depth > 1) {
people.setIdentity(1);
@@ -604,7 +623,7 @@
@Override
public ZInfoUser getInfoById(Long userId) {
- ZInfoUser user = getById(userId);
+ ZInfoUser user = getInfoBysysId(userId);
if(user!=null)
@@ -714,7 +733,12 @@
@Override
public AjaxResult listAllFamilyPeople() {
- List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+// List<ZInfoUser> lis = list();
+// for(ZInfoUser tm: lis)
+// {
+// System.out.println(tm.getRoleId());
+// }
+ List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList());
return AjaxResult.success(collect);
}
@@ -777,6 +801,9 @@
Long spouseId = one.getSpouseId();
if (spouseId != null) {
ZInfoUser spouse = zInfoUserService.getById(spouseId);
+ // System.out.println(spouseId);
+ // System.out.println(spouse);
+ // System.out.println("0000))))))))))))))))");
spouse.setIdentity(people.getIdentity() + 1);
one.setSpouse(spouse);
}
--
Gitblit v1.9.1