From b255f2a8bb78bb5197c8b839853682203c8a1ddc Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期一, 23 九月 2024 22:20:10 +0800 Subject: [PATCH] 修改导入判断 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 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 0b330bf..af92718 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; @@ -422,8 +423,8 @@ // 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"); + // System.out.println(allPeopleList); + //System.out.println("============z=============zzzzzzzzzzzzzzzzzzz"); // List<ZInfoUser> allPeopleList = list(); List<ZInfoUser> result = null; @@ -440,7 +441,7 @@ throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�"); } - System.out.println(result); + // System.out.println(result); // result.stream().map( // data->{ @@ -487,7 +488,7 @@ List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data"); recursionFindUser(treeList); // System.out.println(userList); - System.out.println("---------------"); + // System.out.println("---------------"); List<Genealogy> allData = userList.stream().map( zInfoUser -> { Genealogy newGenealogy = new Genealogy(); @@ -507,8 +508,8 @@ return newGenealogy; } ).collect(Collectors.toList()); - System.out.println(allData); - System.out.println("999999999988888888888++++++++++++++++++++++"); + // System.out.println(allData); + // System.out.println("999999999988888888888++++++++++++++++++++++"); List<Genealogy> collect = allData.stream() .distinct() .filter((data)-> data.getIsMyFamily() == 1) @@ -522,8 +523,8 @@ } resultData.add(collect.get(i)); } - System.out.println(resultData); - System.out.println("999999999988888888888++++++++++++++++++++++"); + // System.out.println(resultData); + // System.out.println("999999999988888888888++++++++++++++++++++++"); // // //瀵箁esult鍋氫竴涓潯浠剁瓫閫� @@ -574,9 +575,9 @@ } } - System.out.println(resultData); + // System.out.println(resultData); - System.out.println("================++++++++++++++66666666666666666999999999"); + // System.out.println("================++++++++++++++66666666666666666999999999"); // for (Genealogy data : resultData) { @@ -693,6 +694,11 @@ // String familyName = zfFamilyService.getById(familyId).getName(); // user.setFamilyName(familyName); // } + } + else{ + //鏌ヨsys_user琛� + + } return user; } @@ -841,7 +847,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) @@ -852,8 +858,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鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥� @@ -879,14 +885,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; } @@ -904,7 +910,7 @@ // if(depth==layer) // layer = layer + 1; - System.out.println(depth); + // System.out.println(depth); List<ZInfoUser> collect = allPeopleList.stream().filter( one -> Objects.equals(one.getFatherId(), people.getUserId()) || Objects.equals(one.getMomId(),people.getUserId()) ).map( -- Gitblit v1.9.1