From 46913f8e05b8b6968f651a0d8cd4b94f726e47e2 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 20 六月 2025 22:35:20 +0800
Subject: [PATCH] 修改了uaid的bug,可以查看到数据了,不能看的就看不了了

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   16 +++++++++++-----
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java   |    4 +++-
 2 files changed, 14 insertions(+), 6 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 399ce23..a69475b 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
@@ -85,10 +85,16 @@
 
     @Override
     public List<ZInfoUser> findByUaidToFaid(String usid) {
-        ZInfoUser zInfoUser = new ZInfoUser();
-        zInfoUser.setUaid(usid);
-        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
-        return list(lqw);
+        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
@@ -184,7 +190,7 @@
         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());
+        lqw.eq(zInfoUser.getUaid() !=null, ZInfoUser::getUaid, zInfoUser.getUaid());
         return lqw;
 
     }
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index 44884f9..94af75e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -328,11 +328,13 @@
         System.out.println(myself.getUaid());
 
         List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+
         if(!fms.isEmpty())
         {
+
             idList.addAll(fms);
         }
-        System.out.println(idList.size());
+
 //        String familyIds = listFamilyIds();
 //        String secondFamilyAuthority = listSecondFamilyIds();
         LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);

--
Gitblit v1.9.1