From 66f842583f1d3980897cd0556b43a2de00078d6d Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期二, 15 八月 2023 21:53:58 +0800 Subject: [PATCH] 78949865 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 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 863c175..1a3606a 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 @@ -326,16 +326,16 @@ */ public AjaxResult listWithTreeByCondition(Integer depth, Genealogy genealogy) { -// ZInfoUser zInfoUser = new ZInfoUser(); -// BeanUtils.copyProperties(genealogy, zInfoUser); -// LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); -// lqw.eq(zInfoUser.getIdentity() != null, ZInfoUser::getIdentity, zInfoUser.getIdentity()); -// lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex()); -// lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName()); -// lqw.eq(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth()); + ZInfoUser zInfoUser = new ZInfoUser(); + BeanUtils.copyProperties(genealogy, zInfoUser); + LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); + lqw.eq(zInfoUser.getIdentity() != null, ZInfoUser::getIdentity, zInfoUser.getIdentity()); + lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex()); + lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName()); + lqw.eq(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth()); -// List<ZInfoUser> allPeopleList = list(lqw); - List<ZInfoUser> allPeopleList = list(); + List<ZInfoUser> allPeopleList = list(lqw); +// List<ZInfoUser> allPeopleList = list(); List<ZInfoUser> result = null; try { result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && (people.getFatherId() == 0 || people.getMomId() == 0)) -- Gitblit v1.9.1