From 1695c8356c17395139bc806ead0596a929518707 Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期二, 16 一月 2024 21:25:47 +0800 Subject: [PATCH] 增加内容 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 80 ++++++++++++++++++++++++++++++++-------- 1 files changed, 64 insertions(+), 16 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 8da6d16..64af105 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 @@ -14,6 +14,7 @@ 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.dto.*; import com.ruoyi.mapper.ZInfoUserMapper; @@ -100,6 +101,27 @@ log.info("杩斿洖鐨勬暟鎹负:{}", list); return list; + } + + @Override + public AjaxResult removeByUserName(List userName) { + LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); + lqw.in(ZInfoUser::getNickName, userName); + List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList()); + removeByIds(ids); + return AjaxResult.success("鍒犻櫎鎴愬姛"); + } + + @Override + public List<ZInfoUser> selectByFamId(long fid) { + LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZfFamily::getId, fid); + ZfFamily zfFamily = zfFamilyService.list(lqw).get(0); + LambdaQueryWrapper<ZInfoUser> lqws = new LambdaQueryWrapper<>(); + lqws.eq(ZInfoUser::getFatherId, zfFamily.getFid()); + // lqws.eq(ZInfoUser::getMomId, zfFamily.getMid()); + List<ZInfoUser> list = list(lqws); + return list; } @Override @@ -299,22 +321,29 @@ List<ZInfoUser> myFamilyPeopleList = allPeopleList.stream().filter(people -> people.getUserId() != 1 && people.getIsMyFamily() == 1).collect(Collectors.toList()); - - result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && (people.getFatherId() == 0 || people.getMomId() == 0) && people.getIsMyFamily() == 1) +result = allPeopleList.stream().filter(people -> people!=null && people.getUserId() != 1 && ((people.getFatherId()!=null &&people.getFatherId() == 0 )|| (people.getMomId()!=null&&people.getMomId() == 0)) && people.getIsMyFamily() == 1) .map(people -> { +// System.out.println("======================================="); +// System.out.println(people); if (depth > 1) { - people.setIdentity(1); - //鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥� - Long spouseId = people.getSpouseId(); - ZInfoUser spouse = zInfoUserService.getById(spouseId); - spouse.setIdentity(1); - people.setSpouse(spouse); - people.setChildList(fillChildren(people, myFamilyPeopleList, depth - 1)); + if(people!=null) { + people.setIdentity(1); + //鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥� + Long spouseId = people.getSpouseId(); + if (spouseId != null) { + ZInfoUser spouse = zInfoUserService.getById(spouseId); + spouse.setIdentity(1); + people.setSpouse(spouse); + } + people.setChildList(fillChildren(people, myFamilyPeopleList, depth - 1)); + } } +// System.out.println("+++++++++++++++++++++++++++++"); +// System.out.println(people); return people; }).collect(Collectors.toList()); - +//System.out.println("--------------++++++++++++++++--------------"); return AjaxResult.success(result); } @@ -576,11 +605,24 @@ @Override public ZInfoUser getInfoById(Long userId) { ZInfoUser user = getById(userId); - Long familyId = user.getFamilyId(); - String familyName = zfFamilyService.getById(familyId).getName(); - String roleName = zfRoleService.getById(user.getRoleId()).getName(); - user.setFamilyName(familyName); - user.setRoleName(roleName); + + + if(user!=null) + { + Long familyId = user.getFamilyId(); + // System.out.println("dddddddddddddddddddd"); + + String roleName = zfRoleService.getById(user.getRoleId()).getName(); + + user.setRoleName(roleName); + System.out.println("dddddddddddddddddddd"); + System.out.println(familyId); + if(familyId!=-1) + { + String familyName = zfFamilyService.getById(familyId).getName(); + user.setFamilyName(familyName); + } + } return user; } @@ -671,6 +713,12 @@ } @Override + public AjaxResult listAllFamilyPeople() { + List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser.getRoleId()== 3).collect(Collectors.toList()); + return AjaxResult.success(collect); + } + + @Override public AjaxResult listMySelfAndSpouse(Long id) { LambdaQueryWrapper<ZInfoUser> lqw1 = new LambdaQueryWrapper<>(); lqw1.eq(ZInfoUser::getUserId, id); @@ -709,7 +757,7 @@ // ).collect(Collectors.toList()); List<ZInfoUser> collect = allPeopleList.stream().filter( - one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()) && (people.getIsMyFamily() == 1) + one -> ((one.getFamilyId()!=null && one.getFatherId() == people.getUserId()) || (one.getMomId()!=null&&one.getMomId() == people.getUserId())) && (people.getIsMyFamily() == 1) ).map( one -> { if (depth == 1) { -- Gitblit v1.9.1