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/MarrySelfServiceImpl.java |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 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 0bbf7d2..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
@@ -8,11 +8,15 @@
 import com.ruoyi.common.utils.bean.BeanUtils;
 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;
 import com.ruoyi.service.MarrySelfService;
 import com.ruoyi.service.MarryUserService;
+import com.ruoyi.service.ZInfoUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,8 +35,13 @@
     @Resource
     MarryUserService marryUserService;
 
+    @Resource
+    ZInfoUserService zInfoUserService;
+
 //    @Resource
 //    MarrySelfService marrySelfService;
+
+
 
     @Override
     public AjaxResult getInfo() {
@@ -51,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);
@@ -69,30 +88,35 @@
     }
 
     @Override
-    public AjaxResult updateData(MarryInfoDto marryInfoDto) {
+    public Boolean updateData(MarryInfoDto marryInfoDto) {
 
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        Long userId = user.getUserId();
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        Long userId = user.getUserId();
 
         MarrySelf marrySelf = new MarrySelf();
         BeanUtils.copyProperties(marryInfoDto,marrySelf);
-        marrySelf.setUid(userId);
+        marrySelf.setUid(marryInfoDto.getUid());
 
         //鍏堟煡璇㈡暟鎹簱涓湁娌℃湁鏈敤鎴风殑鏁版嵁
         LambdaQueryWrapper<MarrySelf> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(MarrySelf::getUid,userId);
+        lqw.eq(MarrySelf::getUid,marryInfoDto.getUid());
         List<MarrySelf> list = list(lqw);
+
 
         if(list.isEmpty()){
             //濡傛灉鏄┖鐨勶紝閭e氨鏄柊澧�
             save(marrySelf);
 
         }else {
+
             //鍚﹀垯灏辨槸淇敼
             marrySelf.setId(list.get(0).getId());
             updateById(marrySelf);
         }
 
-        return AjaxResult.success();
+
+
+
+        return true;
     }
 }

--
Gitblit v1.9.1