From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 402 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 333 insertions(+), 69 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 1a3606a..38f984b 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
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,15 +11,11 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfEvent;
-import com.ruoyi.domain.ZfRelation;
+import com.ruoyi.common.utils.uuid.UUID;
+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;
@@ -30,8 +25,6 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
@@ -53,8 +46,36 @@
@Resource
private ZfFamilyService zfFamilyService;
+
@Resource
private ZfRoleService zfRoleService;
+
+ @Resource
+ private ZfClanService zfClanService;
+
+
+
+ /** 浣跨浉鍚岀敤鎴峰悕+鐢佃瘽鍙风爜鐩稿悓鐨勭敤鎴峰搴旂殑uaid鍚屾*/
+ @Override
+ public void setUaidSame(String phone, String username,String uniqueId){
+ UpdateWrapper<ZInfoUser> wrapper = new UpdateWrapper<>();
+ wrapper.eq(phone!=null,"phone_number", phone)
+ .eq(username!=null,"old_name",username)
+ .set("uaid",uniqueId );
+ this.update(null, wrapper); // 鎵ц鏇存柊
+ }
+
+
+
+ @Override
+ public void setSpouseOnly(Long spouse){
+ UpdateWrapper<ZInfoUser> wrapper = new UpdateWrapper<>();
+ System.out.println("{{{{{{{{{{{{{"+spouse);
+ wrapper.eq("spouse_id", spouse) // 浣跨敤瀛楃涓插瓧娈靛悕
+ .set("spouse_id", null); // 鐩存帴璁剧疆瀛楁鍊�
+ this.update(null, wrapper); // 鎵ц鏇存柊
+ }
+
@Override
public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) {
@@ -67,6 +88,109 @@
HashMap<String, Object> data = MapUtils.getResult(pageResult);
return AjaxResult.success(data);
+ }
+
+ @Override
+ public Boolean findByuid(Long uid, Long tfid) {
+
+
+ if(uid==null)
+ return false;
+ // System.out.println(tfid);
+ // System.out.println("00000000000---------------");
+ ZInfoUser infu = this.getById(tfid);
+ if(infu==null)
+ return false;
+ if(infu.getFatherId()!=null && uid.equals(infu.getFatherId()))
+ return true;
+ if(infu.getMomId()!=null && uid.equals(infu.getMomId()))
+ return true;
+ return findByuid(uid, infu.getFatherId()) || findByuid(uid, infu.getMomId());
+ }
+
+ @Override
+ public List<ZInfoUser> findByUaidToFaid(String usid) {
+ if(usid!=null) {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setUaid(usid);
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+ List<ZInfoUser> ls = list(lqw);
+ // System.out.println(ls.size()+":==========sdfs55dfsdf");
+ return ls;
+ }else {
+ return new ArrayList<>();
+ }
+ }
+
+ @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
+ public ZInfoUser getInfoBysysId(Long sysid) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getSysId, sysid);
+ List<ZInfoUser> list = list(lqw);
+ if(list.size()>0)
+ return list.get(0);
+ else
+ return null;
+ }
+
+
+ @Override
+ public List<ZInfoUser> getDataBySex(Integer sex, Integer clanId){
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getSex, sex);
+ lqw.eq(ZInfoUser::getClanId, clanId);
+ List<ZInfoUser> list = list(lqw);
+ return list;
+ }
+
+ @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) {
@@ -88,7 +212,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.eq(zInfoUser.getUaid() !=null, ZInfoUser::getUaid, zInfoUser.getUaid());
return lqw;
}
@@ -98,8 +225,33 @@
LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = buildCondition(zInfoUser);
List<ZInfoUser> list = list(lambdaQueryWrapper);
log.info("杩斿洖鐨勬暟鎹负:{}", list);
+
return list;
+ }
+
+ @Override
+ public AjaxResult removeByUserName(List<String> userName) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.in(ZInfoUser::getNickName,String.valueOf(userName.get(0)));
+ System.out.println(userName.get(0));
+ List<ZInfoUser> beanRecords = list(lqw);
+ System.out.println("555555555555555555"+beanRecords);
+ 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
@@ -275,9 +427,11 @@
* @return
*/
@Override
- public AjaxResult listWithTree(Integer depth) {
-
- List<ZInfoUser> allPeopleList = list();
+ public AjaxResult listWithTree(Integer depth, Integer clanId) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(clanId!=null, ZInfoUser::getClanId, clanId);
+ // List<ZfEvent> list = list(lqw);
+ List<ZInfoUser> allPeopleList = list(lqw);
List<ZInfoUser> result = null;
// try {
// result = allPeopleList.stream().filter(people -> people.getUserId()!=1&&(people.getFatherId() == 0||people.getMomId()==0))
@@ -299,22 +453,30 @@
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("--------------++++++++++++++++--------------");
+//System.out.println(result);
return AjaxResult.success(result);
}
@@ -329,18 +491,20 @@
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());
-
+// 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");
+
// 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) {
+ if (depth >= 1) {
people.setIdentity(1);
people.setChildList(fillChildren2(people, allPeopleList, depth - 1));
}
@@ -350,6 +514,7 @@
throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
}
+ // System.out.println(result);
// result.stream().map(
// data->{
@@ -374,6 +539,9 @@
// )
+// if(genealogy.getIdentity()!=null){
+// result = result.stream().filter(data -> data.getIdentity() == genealogy.getIdentity()).collect(Collectors.toList());
+// }
return AjaxResult.success(result);
@@ -389,65 +557,94 @@
*/
@Override
public AjaxResult listGenealogy(Genealogy genealogy, Integer pageNum, Integer pageSize) {
+ userList.clear();
List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
recursionFindUser(treeList);
- List<Genealogy> allData = userList.stream().map(
- zInfoUser -> {
- Genealogy newGenealogy = new Genealogy();
- BeanUtils.copyProperties(zInfoUser, newGenealogy);
+ List<Genealogy> allData = userList.stream().map(
+ zInfoUser -> {
+ Genealogy newGenealogy = new Genealogy();
+ BeanUtils.copyProperties(zInfoUser, newGenealogy);
- if (zInfoUser.getSpouseId() != null) {
- ZInfoUser spouse = getById(zInfoUser.getSpouseId());
- newGenealogy.setSpouseName(spouse.getNickName());
- }
- 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());
-
- List<Genealogy> collect = allData.stream().distinct().sorted(Comparator.comparing(Genealogy::getIdentity)).collect(Collectors.toList());
+ List<Genealogy> collect = allData.stream()
+ .distinct()
+ .filter((data)-> data.getIsMyFamily() == 1)
+ .sorted(Comparator.comparing(Genealogy::getIdentity))
+ .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++++++++++++++++++++++");
+//
+//
//瀵箁esult鍋氫竴涓潯浠剁瓫閫�
- Iterator<Genealogy> it = resultData.iterator();
+ Iterator<Genealogy> it = collect.iterator();
while(it.hasNext()){
Genealogy data = it.next();
if(genealogy.getIdentity()!=null){
if(data.getIdentity()!=genealogy.getIdentity()){
it.remove();
+ continue;
}
}
if(genealogy.getNickName()!=null){
if(!data.getNickName().contains(genealogy.getNickName())){
it.remove();
+ continue;
}
}
if(genealogy.getSex()!=null){
if(data.getSex()!=genealogy.getSex()){
it.remove();
+ continue;
+ }
+ }
+
+ if(genealogy.getPhoneNumber()!=null){
+ if(data.getPhoneNumber()!=genealogy.getPhoneNumber()){
+ it.remove();
+ continue;
+ }
+ }
+
+ if(genealogy.getUnit()!=null){
+ if(data.getUnit()!=genealogy.getUnit()){
+ it.remove();
+ continue;
}
}
if(genealogy.getBirth()!=null){
- if(data.getBirth()!=genealogy.getBirth()){
- it.remove();
+ 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");
// for (Genealogy data : resultData) {
@@ -477,10 +674,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);
@@ -496,6 +700,11 @@
BeanUtils.copyProperties(zInfoUser, genealogy);
if (zInfoUser.getSpouseId() != null) {
ZInfoUser spouse = getById(zInfoUser.getSpouseId());
+ Genealogy spouseInfo = new Genealogy();
+ BeanUtils.copyProperties(spouse,spouseInfo);
+ spouseInfo.setIdentity(genealogy.getIdentity());
+ spouseInfo.setSpouseName(zInfoUser.getNickName());
+ genealogy.setSpouse(spouseInfo);
genealogy.setSpouseName(spouse.getNickName());
}
result.add(genealogy);
@@ -521,7 +730,13 @@
genealogy.setIdentity(params.get(i).getIdentity());
if (zInfoUsers.get(i).getSpouseId() != null) {
ZInfoUser spouse = getById(zInfoUsers.get(i).getSpouseId());
+ Genealogy spouseInfo = new Genealogy();
+ BeanUtils.copyProperties(spouse,spouseInfo);
+ spouseInfo.setIdentity(genealogy.getIdentity());
genealogy.setSpouseName(spouse.getNickName());
+ spouseInfo.setSpouseName(zInfoUsers.get(i).getNickName());
+ genealogy.setSpouse(spouseInfo);
+
}
result.add(genealogy);
@@ -534,11 +749,26 @@
@Override
public ZInfoUser getInfoById(Long userId) {
- ZInfoUser user = getById(userId);
+ ZInfoUser user = getInfoBysysId(userId);
+
+ 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();
- String familyName = zfFamilyService.getById(familyId).getName();
+ // System.out.println("dddddddddddddddddddd");
+ if(user.getRoleId()==null)
+ user.setRoleId(3L);
String roleName = zfRoleService.getById(user.getRoleId()).getName();
- user.setFamilyName(familyName);
+
user.setRoleName(roleName);
return user;
}
@@ -578,7 +808,17 @@
public ZInfoUser getMyself() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return getById(userId);
+ // System.out.println(userId);
+ //System.out.println("-----------------++++++++9999++++++++++----------");
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setSysId(userId);
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(zInfoUser.getSysId() != null, ZInfoUser::getSysId, zInfoUser.getSysId());
+ List<ZInfoUser> list = list(lqw);
+ if(!list.isEmpty())
+ return list.get(0);
+ else
+ return null;
}
@Override
@@ -586,6 +826,8 @@
return null;
}
+
+
private void recursionFindUser(List<ZInfoUser> treeList) {
@@ -630,6 +872,22 @@
}
@Override
+ public AjaxResult listAllFamilyPeople(Integer clanId) {
+// List<ZInfoUser> lis = list();
+// for(ZInfoUser tm: lis)
+// {
+// System.out.println(tm.getRoleId());
+// }
+ LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getClanId, clanId);
+ List<ZInfoUser> lis = list(zInfoUserLambdaQueryWrapper);
+ List<ZInfoUser> collect = lis.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);
@@ -661,17 +919,20 @@
// 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)
// ).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 && Objects.equals(one.getFatherId(), people.getUserId())) || (one.getMomId()!=null&& one.getMomId().equals(people.getUserId()))) && (one.getIsMyFamily() == 1))
).map(
one -> {
- if (depth == 1) {
+ // System.out.println("++++++++++----0009999");
+ // System.out.println(one);
+ if (depth == 0) {
one.setIdentity(people.getIdentity() + 1);
//鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥�
Long spouseId = one.getSpouseId();
@@ -688,19 +949,22 @@
Long spouseId = one.getSpouseId();
if (spouseId != null) {
ZInfoUser spouse = zInfoUserService.getById(spouseId);
+ // System.out.println(spouseId);
+ // System.out.println(spouse);
+ // System.out.println("0000))))))))))))))))");
spouse.setIdentity(people.getIdentity() + 1);
one.setSpouse(spouse);
}
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;
}
@@ -718,9 +982,9 @@
// if(depth==layer)
// layer = layer + 1;
- System.out.println(depth);
+ // System.out.println(depth);
List<ZInfoUser> collect = allPeopleList.stream().filter(
- one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId())
+ one -> Objects.equals(one.getFatherId(), people.getUserId()) || Objects.equals(one.getMomId(),people.getUserId())
).map(
one -> {
if (depth == 1)
@@ -736,14 +1000,14 @@
}
List<ZInfoUser> zinfo = fillChildren2(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;
}
--
Gitblit v1.9.1