From 68f85f044cd71cd3db6514c3bf5b5129ed2e3e78 Mon Sep 17 00:00:00 2001
From: zqy <2522236926>
Date: 星期一, 10 六月 2024 23:44:50 +0800
Subject: [PATCH] 家庭小医生的分享
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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..7f70e46 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
@@ -12,10 +12,7 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfEvent;
-import com.ruoyi.domain.ZfFamily;
-import com.ruoyi.domain.ZfRelation;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.*;
import com.ruoyi.mapper.ZInfoUserMapper;
import com.ruoyi.service.ZInfoUserService;
@@ -70,6 +67,17 @@
}
+ @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<>();
@@ -104,10 +112,13 @@
}
@Override
- public AjaxResult removeByUserName(List userName) {
+ public AjaxResult removeByUserName(List<String> userName) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
- lqw.in(ZInfoUser::getNickName, userName);
- List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList());
+ lqw.in(ZInfoUser::getNickName,String.valueOf(userName.get(0)));
+ System.out.println(userName.get(0));
+ List<ZInfoUser> beanRecords = list(lqw);
+ System.out.println("555555555555555555"+beanRecords);
+ List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList());;
removeByIds(ids);
return AjaxResult.success("鍒犻櫎鎴愬姛");
}
@@ -366,7 +377,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);
@@ -714,7 +725,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);
}
--
Gitblit v1.9.1