From b81f959f7d8180cb26a2879265a1183742609383 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 10 六月 2025 19:52:05 +0800
Subject: [PATCH] 修改婚姻bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 9 +++++----
1 files changed, 5 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 0cda51d..48e60aa 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
@@ -14,6 +14,7 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.domain.*;
+import com.ruoyi.domain.dto.MarryInfoDto;
import com.ruoyi.service.*;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysRoleMapper;
@@ -245,7 +246,7 @@
// }
System.out.println("{{{{{{{{{{{{{{{"+user);
- if (user.getSpouseId() != null && !byId.getSpouseId().equals(user.getSpouseId())){
+ if (user.getSpouseId() != null ){
//璺熼殢閰嶅伓鐨勫鏃忓拰瀹跺涵淇℃伅
// if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
@@ -274,7 +275,7 @@
return AjaxResult.error("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
}
//鏇存柊閰嶅伓淇℃伅
- if(user.getSpouseId() != null && !byId.getSpouseId().equals(user.getSpouseId())) {
+ if(user.getSpouseId() != null) {
ZInfoUser zu = new ZInfoUser();
zu.setUserId(user.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
@@ -289,7 +290,7 @@
//鏇存柊MarrySelf鍜孧arryUser
ZInfoUser zfi = zInfoUserService.getById(user.getUserId());
- MarrySelf marrySelf = new MarrySelf();
+ MarryInfoDto marrySelf = new MarryInfoDto();
marrySelf.setUid(user.getSpouseId());
marrySelf.setName(zfi.getOldName());
marrySelf.setSpouseSex(zfi.getSex()==1?"鐢�":"濂�");
@@ -298,7 +299,7 @@
marrySelf.setSpouseName(infoUser.getOldName());
marrySelf.setSpouseSex(infoUser.getSex()==1?"鐢�":"濂�");
marrySelf.setSpouseMarryStatus(0);
- marrySelfService.saveOrUpdate(marrySelf);
+ marrySelfService.updateData(marrySelf);
//澧炲姞MarryUser
//澧炲姞marryUser
MarryUser marryUser = new MarryUser();
--
Gitblit v1.9.1