修改了memo代码

feige

2024-04-28 1b0953e72217f63bbc83d15d49afd5f1cb6577f8

 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;
@@ -69,6 +70,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<>();
@@ -100,6 +112,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 +332,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);

    }
@@ -337,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);
@@ -576,11 +616,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 +724,17 @@
    }

    @Override
    public AjaxResult listAllFamilyPeople() {
//        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);
    }

    @Override
    public AjaxResult listMySelfAndSpouse(Long id) {
        LambdaQueryWrapper<ZInfoUser> lqw1 = new LambdaQueryWrapper<>();
        lqw1.eq(ZInfoUser::getUserId, id);
@@ -709,7 +773,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) {