From 35924055a41e1505aceacef503fd3cfa7a064a36 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 26 八月 2025 20:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 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..eef64c0 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,26 @@
//鍐嶆煡璇㈠墠浠荤殑淇℃伅
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());
+
+ fms.add(zInfoUser.getSysId());
+
+ 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