From 7a4475a4a35c06244875b0b1888bb83c5351ca47 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期日, 13 十月 2024 22:22:57 +0800 Subject: [PATCH] 修改了bug --- zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 81 ++++++++++++++++++++++++++++++++-------- 1 files changed, 64 insertions(+), 17 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 0e898f9..dabcdb4 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 @@ -48,6 +48,7 @@ @Resource private ZfFamilyService zfFamilyService; + @Resource private ZfRoleService zfRoleService; @@ -90,6 +91,34 @@ return list(lqw); } + +// public List<ZInfoUser> selectByNickName(String nickName){ +// ZInfoUser zInfoUser = new ZInfoUser(); +// zInfoUser.setNickName(nickName); +// LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser); +// return list(lqw); +// } + + @Override + public AjaxResult findInfoUserNameAClan(String nickName) + { + ZInfoUser zInfoUser = new ZInfoUser(); + zInfoUser.setNickName(nickName); + + LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser); + List<ZInfoUser> zInfoUsers = list(lqw); + List<ShareOtherClan> shareOtherClans = new ArrayList<>(); + + for (ZInfoUser zInfoUser1: zInfoUsers) { + ShareOtherClan shareOtherClan = new ShareOtherClan(); + shareOtherClan.setNickName(zInfoUser1.getNickName()); + shareOtherClan.setUserId(zInfoUser1.getUserId().intValue()); + shareOtherClan.setClanId(zInfoUser1.getClanId()); + shareOtherClans.add(shareOtherClan); + } + return AjaxResult.success(shareOtherClans); + } + @Override public ZInfoUser getInfoBysysId(Long sysid) { LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); @@ -103,9 +132,10 @@ @Override - public List<ZInfoUser> getDataBySex(Integer sex){ + public List<ZInfoUser> getDataBySex(Integer sex, Integer clanId){ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZInfoUser::getSex, sex); + lqw.eq(ZInfoUser::getClanId, clanId); List<ZInfoUser> list = list(lqw); return list; } @@ -421,12 +451,15 @@ // lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth()); lqw.eq(zInfoUser.getClanId()!=null, ZInfoUser::getClanId,zInfoUser.getClanId()); List<ZInfoUser> allPeopleList = list(lqw); + // System.out.println(allPeopleList); + //System.out.println("============z=============zzzzzzzzzzzzzzzzzzz"); + // List<ZInfoUser> allPeopleList = list(); List<ZInfoUser> result = null; try { 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) { + if (depth >= 1) { people.setIdentity(1); people.setChildList(fillChildren2(people, allPeopleList, depth - 1)); } @@ -436,6 +469,7 @@ throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�"); } + // System.out.println(result); // result.stream().map( // data->{ @@ -478,9 +512,11 @@ */ @Override public AjaxResult listGenealogy(Genealogy genealogy, Integer pageNum, Integer pageSize) { + userList.clear(); List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data"); recursionFindUser(treeList); - + // System.out.println(userList); + // System.out.println("---------------"); List<Genealogy> allData = userList.stream().map( zInfoUser -> { Genealogy newGenealogy = new Genealogy(); @@ -496,10 +532,12 @@ spouseInfo.setSpouseName(zInfoUser.getNickName()); newGenealogy.setSpouseName(spouse.getNickName()); } + System.out.println(newGenealogy); return newGenealogy; } ).collect(Collectors.toList()); - + // System.out.println(allData); + // System.out.println("999999999988888888888++++++++++++++++++++++"); List<Genealogy> collect = allData.stream() .distinct() .filter((data)-> data.getIsMyFamily() == 1) @@ -513,8 +551,10 @@ } resultData.add(collect.get(i)); } - - + // System.out.println(resultData); + // System.out.println("999999999988888888888++++++++++++++++++++++"); +// +// //瀵箁esult鍋氫竴涓潯浠剁瓫閫� Iterator<Genealogy> it = resultData.iterator(); while(it.hasNext()){ @@ -563,8 +603,9 @@ } } - System.out.println(resultData); + // System.out.println(resultData); + // System.out.println("================++++++++++++++66666666666666666999999999"); // for (Genealogy data : resultData) { @@ -669,7 +710,8 @@ { Long familyId = user.getFamilyId(); // System.out.println("dddddddddddddddddddd"); - + if(user.getRoleId()==null) + user.setRoleId(3L); String roleName = zfRoleService.getById(user.getRoleId()).getName(); user.setRoleName(roleName); @@ -680,6 +722,11 @@ // String familyName = zfFamilyService.getById(familyId).getName(); // user.setFamilyName(familyName); // } + } + else{ + //鏌ヨsys_user琛� + + } return user; } @@ -828,7 +875,7 @@ // if(depth==layer) // layer = layer + 1; - System.out.println(depth); + // System.out.println(depth); // List<ZInfoUser> myFamilyPeopleList = allPeopleList.stream().filter( // one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()) && (people.getIsMyFamily() == 1) @@ -839,8 +886,8 @@ one -> (((one.getFamilyId()!=null && Objects.equals(one.getFatherId(), people.getUserId())) || (one.getMomId()!=null&& one.getMomId().equals(people.getUserId()))) && (one.getIsMyFamily() == 1)) ).map( one -> { - System.out.println("++++++++++----0009999"); - System.out.println(one); + // System.out.println("++++++++++----0009999"); + // System.out.println(one); if (depth == 0) { one.setIdentity(people.getIdentity() + 1); //鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥� @@ -866,14 +913,14 @@ } List<ZInfoUser> zinfo = fillChildren(one, allPeopleList, depth - 1); one.setChildList(zinfo); - System.out.println(one); + // System.out.println(one); return one; } //return one; } ).collect(Collectors.toList()); - System.out.println(collect); + // System.out.println(collect); return collect; } @@ -891,9 +938,9 @@ // if(depth==layer) // layer = layer + 1; - System.out.println(depth); + // System.out.println(depth); List<ZInfoUser> collect = allPeopleList.stream().filter( - one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()) + one -> Objects.equals(one.getFatherId(), people.getUserId()) || Objects.equals(one.getMomId(),people.getUserId()) ).map( one -> { if (depth == 1) @@ -909,14 +956,14 @@ } List<ZInfoUser> zinfo = fillChildren2(one, allPeopleList, depth - 1); one.setChildList(zinfo); - System.out.println(one); + // System.out.println(one); return one; } //return one; } ).collect(Collectors.toList()); - System.out.println(collect); + // System.out.println(collect); return collect; } -- Gitblit v1.9.1