修改了bug

feige

2024-11-19 e4e92aa0b85c414cd4cb706d76d5db557a521757

 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java

@@ -48,6 +48,7 @@
    @Resource
    private ZfFamilyService zfFamilyService;


    @Resource
    private ZfRoleService zfRoleService;

@@ -88,6 +89,34 @@
        zInfoUser.setClanId(clanId);
        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
        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
@@ -141,7 +170,7 @@
        lqw.like(StringUtils.isNotEmpty(zInfoUser.getUnit()), ZInfoUser::getUnit, zInfoUser.getUnit());
        lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
        lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
        lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
        lqw.le(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
        lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
        return lqw;

@@ -422,8 +451,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 +469,7 @@
            throw new RuntimeException("您在加入成员的时候没有指定该成员的父亲或者母亲");
        }

        System.out.println(result);
       // System.out.println(result);

//        result.stream().map(
//                data->{
@@ -487,7 +516,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 +536,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 +551,8 @@
            }
            resultData.add(collect.get(i));
        }
        System.out.println(resultData);
        System.out.println("999999999988888888888++++++++++++++++++++++");
     //   System.out.println(resultData);
      //  System.out.println("999999999988888888888++++++++++++++++++++++");
//
//
        //对result做一个条件筛选
@@ -566,7 +595,7 @@
                }
            }

            if(genealogy.getBirth()!=null){
            if(genealogy.getBirth()!=null&&data.getBirth()!=null){
                if(data.getBirth().compareTo(genealogy.getBirth())!=0){
                    it.remove();
                    continue;
@@ -574,9 +603,9 @@
            }
        }

       System.out.println(resultData);
   //    System.out.println(resultData);

        System.out.println("================++++++++++++++66666666666666666999999999");
      //  System.out.println("================++++++++++++++66666666666666666999999999");


//        for (Genealogy data : resultData) {
@@ -677,23 +706,25 @@
        ZInfoUser user = getInfoBysysId(userId);


        if(user!=null)
        {
            Long familyId = user.getFamilyId();
          //  System.out.println("dddddddddddddddddddd");
            if(user.getRoleId()==null)
                user.setRoleId(3L);
            String roleName = zfRoleService.getById(user.getRoleId()).getName();
        if(user==null) {
            //利用userId查询
            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
            lqw.eq(ZInfoUser::getUserId, userId);
            List<ZInfoUser> list = list(lqw);
            if(list.size()>0)
                user = list.get(0);
            else
                return null;

            user.setRoleName(roleName);
//            System.out.println("dddddddddddddddddddd");
//            System.out.println(familyId);
//            if(familyId!=null&&familyId!=-1)
//            {
//                String familyName = zfFamilyService.getById(familyId).getName();
//                user.setFamilyName(familyName);
//            }
        }

        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);
        return user;
    }

@@ -841,7 +872,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 +883,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 +910,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 +935,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(