From e629bce5164adc765780301114f95a60140eadd7 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 10 六月 2025 19:20:27 +0800
Subject: [PATCH] 修改婚姻bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 986bac2..0cda51d 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
@@ -214,7 +214,8 @@
// infoUser.setFatherId(zfFamily.getFid());
// if(zfFamily!=null&&zfFamily.getMid()!=null)
// infoUser.setMomId(zfFamily.getMid());
- Long myFamily = zInfoUserService.getById(user).getFamilyId();
+ ZInfoUser byId = zInfoUserService.getById(user);
+ Long myFamily = byId.getFamilyId();
if (myFamily != null) infoUser.setFamilyId(myFamily);
if (user.getFid() != null){
//璺熼殢鐖朵翰鐨勫鏃忓拰瀹跺涵淇℃伅
@@ -242,7 +243,9 @@
// System.out.println("2222222222222222222222222222222222/");
// infoUser.setFamilyId(mother.getFamilyId());
// }
- if (user.getSpouseId() != null){
+ System.out.println("{{{{{{{{{{{{{{{"+user);
+
+ if (user.getSpouseId() != null && !byId.getSpouseId().equals(user.getSpouseId())){
//璺熼殢閰嶅伓鐨勫鏃忓拰瀹跺涵淇℃伅
// if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
@@ -264,14 +267,14 @@
}
- if(infoUser.getFamilyId() != null)
+ if(infoUser.getFamilyId() != null )
zInfoUserService.saveOrUpdate(infoUser);
else {
System.out.println("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
return AjaxResult.error("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
}
//鏇存柊閰嶅伓淇℃伅
- if(user.getSpouseId()!=null) {
+ if(user.getSpouseId() != null && !byId.getSpouseId().equals(user.getSpouseId())) {
ZInfoUser zu = new ZInfoUser();
zu.setUserId(user.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
--
Gitblit v1.9.1