From f1831ec9329d0fb5e424b35064ca8e5f05a7920a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 08 七月 2025 22:21:34 +0800
Subject: [PATCH] 修改了数据

---
 zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
index ad7dc4d..1f48226 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
@@ -9,6 +9,7 @@
 import com.ruoyi.domain.MarrySelf;
 import com.ruoyi.domain.MarryUser;
 import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZSelfNote;
 import com.ruoyi.domain.dto.MarryInfoDto;
 import com.ruoyi.domain.dto.MarryUserDto;
 import com.ruoyi.mapper.MarrySelfMapper;
@@ -34,7 +35,8 @@
     @Resource
     MarryUserService marryUserService;
 
-
+    @Resource
+    ZInfoUserService zInfoUserService;
 
 //    @Resource
 //    MarrySelfService marrySelfService;
@@ -58,15 +60,25 @@
 
         //鍐嶆煡璇㈠墠浠荤殑淇℃伅
         LambdaQueryWrapper<MarryUser> marryUserLQW = new LambdaQueryWrapper<>();
-        marryUserLQW.eq(MarryUser::getUid,userId);
+
+
+        //鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
+        ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+        //鎷垮埌鎵�鏈夌殑sysid
+        List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+
+
+        marryUserLQW.in(MarryUser::getUid, fms);
+      //  marryUserLQW.eq(MarryUser::getUid,userId);
         List<MarryUser> spouseList = marryUserService.list(marryUserLQW);
         List<MarryUserDto> frontList = spouseList.stream().map(s -> {
+            System.out.println(s);
             MarryUserDto marryUserDto = new MarryUserDto();
             BeanUtils.copyProperties(s, marryUserDto);
             return marryUserDto;
         }).collect(Collectors.toList());
-
-
+        System.out.println("++++++++++++----------------");
+        System.out.println(frontList);
         //鏈�缁堣繑鍥炴暟鎹ā鍨�
         MarryInfoDto result = new MarryInfoDto();
         BeanUtils.copyProperties(myself,result);

--
Gitblit v1.9.1