修改uaid的空判断

feige

2025-06-20 e416ac6496d52be7ac416da33ea4395cf9bcc4e9

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

@@ -13,10 +13,7 @@
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.*;
import com.ruoyi.mapper.ZInfoUserMapper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRelationService;
import com.ruoyi.service.ZfRoleService;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +23,6 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * <p>
 *  服务实现类
@@ -51,6 +47,10 @@

    @Resource
    private ZfRoleService zfRoleService;

    @Resource
    private ZfClanService zfClanService;


    @Override
    public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) {
@@ -84,11 +84,50 @@
    }

    @Override
    public List<ZInfoUser> findByUaidToFaid(String usid) {
        ZInfoUser zInfoUser = new ZInfoUser();
        zInfoUser.setUaid(usid);
        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
        return list(lqw);
    }

    @Override
    public List<ZInfoUser> selectByClanId(Integer clanId) {
        ZInfoUser zInfoUser = new ZInfoUser();
        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 findUserNameAClan(List<String> nickNames)
    {
        List<ZfShareOther> shareOtherClans = new ArrayList<>();
        for (String nickName:nickNames) {
        ZInfoUser zInfoUser = new ZInfoUser();
        zInfoUser.setNickName(nickName);

        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
        List<ZInfoUser> zInfoUsers = list(lqw);


        for (ZInfoUser zInfoUser1: zInfoUsers) {
            ZfShareOther shareOtherClan = new ZfShareOther();
            shareOtherClan.setUserName(zInfoUser1.getNickName());
            shareOtherClan.setUserId(zInfoUser1.getUserId().intValue());
            shareOtherClan.setClanId(zInfoUser1.getClanId());
            shareOtherClan.setClanName(zfClanService.getById(zInfoUser1.getClanId()).getClanName());
            shareOtherClans.add(shareOtherClan);
        }}
        return AjaxResult.success(shareOtherClans);
    }

    @Override
@@ -142,8 +181,10 @@
        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());

        lqw.le(zInfoUser.getUaid()!=null, ZInfoUser::getUaid, zInfoUser.getUserId());
        return lqw;

    }
@@ -153,6 +194,7 @@
        LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = buildCondition(zInfoUser);
        List<ZInfoUser> list = list(lambdaQueryWrapper);
        log.info("返回的数据为:{}", list);

        return list;

    }
@@ -418,13 +460,13 @@
        ZInfoUser zInfoUser = new ZInfoUser();
        BeanUtils.copyProperties(genealogy, zInfoUser);
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
        lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
//        lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
//        lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
//        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;
@@ -441,7 +483,7 @@
            throw new RuntimeException("您在加入成员的时候没有指定该成员的父亲或者母亲");
        }

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

//        result.stream().map(
//                data->{
@@ -487,29 +529,26 @@
        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();
                    BeanUtils.copyProperties(zInfoUser, newGenealogy);

                    if (zInfoUser.getSpouseId() != null) {
                        ZInfoUser spouse = getById(zInfoUser.getSpouseId());
                List<Genealogy> allData = userList.stream().map(
                        zInfoUser -> {
                            Genealogy newGenealogy = new Genealogy();
                            BeanUtils.copyProperties(zInfoUser, newGenealogy);

                        Genealogy spouseInfo = new Genealogy();
                        BeanUtils.copyProperties(spouse,spouseInfo);
                        newGenealogy.setSpouse(spouseInfo);
                        spouseInfo.setIdentity(newGenealogy.getIdentity());
                        spouseInfo.setSpouseName(zInfoUser.getNickName());
                        newGenealogy.setSpouseName(spouse.getNickName());
                    }
                    System.out.println(newGenealogy);
                    return newGenealogy;
                }
                            if (zInfoUser.getSpouseId() != null) {
                                ZInfoUser spouse = getById(zInfoUser.getSpouseId());

                                Genealogy spouseInfo = new Genealogy();
                                BeanUtils.copyProperties(spouse,spouseInfo);
                                newGenealogy.setSpouse(spouseInfo);
                                spouseInfo.setIdentity(newGenealogy.getIdentity());
                                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)
@@ -517,18 +556,13 @@
                .collect(Collectors.toList());
        List<Genealogy> resultData = new ArrayList<>();

        for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize + pageSize; i++) {
            if (i >= collect.size()) {
                break;
            }
            resultData.add(collect.get(i));
        }
        System.out.println(resultData);
        System.out.println("999999999988888888888++++++++++++++++++++++");

     //   System.out.println(resultData);
      //  System.out.println("999999999988888888888++++++++++++++++++++++");
//
//
        //对result做一个条件筛选
        Iterator<Genealogy> it = resultData.iterator();
        Iterator<Genealogy> it = collect.iterator();
        while(it.hasNext()){
            Genealogy data = it.next();

@@ -568,16 +602,18 @@
            }

            if(genealogy.getBirth()!=null){
                if(data.getBirth().compareTo(genealogy.getBirth())!=0){
                    it.remove();
                    continue;
                if(data.getBirth()!=null) {
                    if (data.getBirth().compareTo(genealogy.getBirth()) != 0) {
                        it.remove();
                    }
                }
                else it.remove();
            }
        }

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

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


//        for (Genealogy data : resultData) {
@@ -607,10 +643,17 @@
//            }
//
//        }
        for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize; i++) {
            if (i >= collect.size()) {
                break;
            }
            System.out.println(i+"//////"+collect.get(i));
            resultData.add(collect.get(i));
        }

        HashMap<String, Object> resultMap = new HashMap<>();
        resultMap.put("data", resultData);
        resultMap.put("total", resultData.size());
        resultMap.put("total", collect.size());
        resultMap.put("pageNum", pageNum);
        resultMap.put("pageSize", pageSize);

@@ -677,29 +720,25 @@
    public ZInfoUser getInfoById(Long userId) {
        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();

            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);
//            }
        }
        else{
            //查询sys_user表

        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;

        }

        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;
    }

@@ -756,6 +795,8 @@

        return null;
    }




    private void recursionFindUser(List<ZInfoUser> treeList) {
@@ -847,7 +888,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)
@@ -858,8 +899,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查询配偶的数据，封装好一起返回
@@ -885,14 +926,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;

    }
@@ -910,7 +951,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(