From f610e1425f1e5ff2cb88b17312b24121fd2fa6a5 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 09 九月 2025 20:31:37 +0800
Subject: [PATCH] 同一用户 同步婚姻
---
zhang-content/src/main/java/com/ruoyi/service/MarrySelfService.java | 4 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java | 8 +++++++-
zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 2 ++
4 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 07c2889..6944147 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -537,6 +537,8 @@
if(same){
zInfoUserService.setUserInfoSame(infoUser);
+ marrySelfService.setMarryInfoSame(infoUser,marrySelf.getId());
+
}
// 5.5.1 鏇存柊閰嶅伓鍏宠仈淇℃伅
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
index 4173dac..d1e4f15 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
@@ -75,13 +75,19 @@
sysUser.setSex(marryInfoDto.getSpouseSex().equals("鐢�") ? "0" : "1");
userService.updateUser(sysUser);
}
+ List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(infoBysysId.getUaid());
+
+ for (ZInfoUser zInfoUser1:byUaidToFaid){
+ marryInfoDto.setUid(zInfoUser1.getSysId());
+ marrySelfService.updateData(marryInfoDto);
+ }
}} catch (Exception e) {
e.printStackTrace();
System.out.println("鎶ラ敊"+e.getMessage());
return AjaxResult.error("鏇存柊澶辫触");
}
- return AjaxResult.success( marrySelfService.updateData(marryInfoDto));
+ return AjaxResult.success( );
}
//瀵煎嚭
diff --git a/zhang-content/src/main/java/com/ruoyi/service/MarrySelfService.java b/zhang-content/src/main/java/com/ruoyi/service/MarrySelfService.java
index f0225d9..8f9cea2 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/MarrySelfService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/MarrySelfService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.MarrySelf;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.dto.MarryInfoDto;
/**
@@ -12,6 +13,9 @@
* @Version 1.0.0
**/
public interface MarrySelfService extends IService<MarrySelf> {
+
+ void setMarryInfoSame(ZInfoUser zInfoUser, Long id);
+
AjaxResult getInfo();
Boolean updateData(MarryInfoDto marryInfoDto);
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 eef64c0..6a3816b 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
@@ -21,6 +21,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -41,6 +42,37 @@
// @Resource
// MarrySelfService marrySelfService;
+ @Override
+ public void setMarryInfoSame(ZInfoUser zInfoUser,Long id){
+
+ List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid());
+
+ List<Long> resultIds = byUaidToFaid.stream()
+ .map(ZInfoUser::getSysId)
+ .filter(sysId -> !Objects.equals(sysId, zInfoUser.getSysId()))
+ .collect(Collectors.toList());
+ if (resultIds.size() != 0){
+
+ LambdaQueryWrapper<MarrySelf> marrySelfLQW = new LambdaQueryWrapper<>();
+ marrySelfLQW.eq(MarrySelf::getUid,resultIds.get(0));
+ MarrySelf myself = getOne(marrySelfLQW);
+
+
+ MarrySelf newUser = new MarrySelf();
+ // 鎷疯礉鎵�鏈夊睘鎬�
+ org.springframework.beans.BeanUtils.copyProperties(myself, newUser);
+
+ newUser.setUid(zInfoUser.getSysId());
+ newUser.setId(id);
+
+
+ System.out.println("ddddd"+newUser);
+
+
+ this.updateById(newUser);
+ }
+
+ }
@Override
--
Gitblit v1.9.1