From 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 16 六月 2024 13:45:39 +0800
Subject: [PATCH] 修改了权限的代码

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |  196 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 167 insertions(+), 29 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..314d72a 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,8 +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;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -12,9 +10,7 @@
 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.domain.*;
 import com.ruoyi.domain.dto.*;
 import com.ruoyi.mapper.ZInfoUserMapper;
 import com.ruoyi.service.ZInfoUserService;
@@ -30,7 +26,6 @@
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * <p>
@@ -69,6 +64,46 @@
 
     }
 
+    @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==infu.getFatherId())
+            return true;
+        if(infu.getMomId()!=null && uid==infu.getMomId())
+            return true;
+        return findByuid(uid, infu.getFatherId()) || findByuid(uid, infu.getMomId());
+    }
+
+    @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 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 +135,30 @@
         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
@@ -299,22 +358,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,16 +396,15 @@
         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.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
 
         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))
+            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);
@@ -374,6 +440,9 @@
 //        )
 
 
+//        if(genealogy.getIdentity()!=null){
+//            result = result.stream().filter(data -> data.getIdentity() == genealogy.getIdentity()).collect(Collectors.toList());
+//        }
 
         return AjaxResult.success(result);
 
@@ -399,13 +468,23 @@
 
                     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());
                     }
                     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++) {
@@ -424,24 +503,42 @@
             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()){
+                if(data.getBirth().compareTo(genealogy.getBirth())!=0){
                     it.remove();
+                    continue;
                 }
             }
         }
@@ -496,6 +593,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 +623,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,12 +642,25 @@
 
     @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);
+        ZInfoUser user = getInfoBysysId(userId);
+
+
+        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!=null&&familyId!=-1)
+//            {
+//                String familyName = zfFamilyService.getById(familyId).getName();
+//                user.setFamilyName(familyName);
+//            }
+        }
         return user;
     }
 
@@ -630,6 +751,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);
@@ -668,10 +800,13 @@
 //        ).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,6 +823,9 @@
                         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);
                         }

--
Gitblit v1.9.1