From bc74ffaaa0074a96d7e7e60838845d020f94f347 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 27 十月 2024 21:16:05 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 98 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 80 insertions(+), 18 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 8a6eac9..be97a3d 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
@@ -7,17 +7,14 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfAncestor;
-import com.ruoyi.domain.ZfFamily;
-import com.ruoyi.domain.sysUserAndUserInfo;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfAncestorService;
-import com.ruoyi.service.ZfFamilyService;
+import com.ruoyi.domain.*;
+import com.ruoyi.service.*;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
@@ -80,6 +77,12 @@
@Resource
private SysUserRoleMapper sysUserRoleMapper;
+ @Resource
+
+ MarrySelfService marrySelfService;
+ @Resource
+ MarryUserService marryUserService;
+
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
@@ -199,7 +202,7 @@
// if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
ZInfoUser father = zInfoUserService.getById(user.getFid());
System.out.println("11111111111111111111111111111111/");
- infoUser.setFamilyId(father.getFamilyId());
+ // infoUser.setFamilyId(father.getFamilyId());
infoUser.setClanId(father.getClanId());
// }
@@ -211,7 +214,7 @@
// if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
ZInfoUser mother = zInfoUserService.getById(user.getMid());
System.out.println("11111111111111111111111111111111/");
- infoUser.setFamilyId(mother.getFamilyId());
+ // infoUser.setFamilyId(mother.getFamilyId());
infoUser.setClanId(mother.getClanId());
}
// else if(user.getMid() != null){
@@ -221,16 +224,25 @@
// infoUser.setFamilyId(mother.getFamilyId());
// }
if (user.getSpouseId() != null){
+
+ //璺熼殢閰嶅伓鐨勫鏃忓拰瀹跺涵淇℃伅
// if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
- //鏄湰瀹�
- if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
+ //鏄湰瀹�,涓�绉嶆槸鏅�氱敤鎴锋洿鏂颁负瀹跺涵鐢ㄦ埛锛�
+
+ if (zInfoUserService.getById(user.getUserId())==null||zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
System.out.println("33333333333333333333333333333333333333333/");
infoUser.setFamilyId(spouse.getFamilyId());
+ infoUser.setFatherId(spouse.getFatherId());
+ infoUser.setMomId(spouse.getMomId());
infoUser.setClanId(spouse.getClanId());
+
// }
- }}
+ }
+
+
+ }
if(infoUser.getFamilyId()!=null)
zInfoUserService.saveOrUpdate(infoUser);
else {
@@ -242,12 +254,34 @@
ZInfoUser zu = new ZInfoUser();
zu.setUserId(user.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
- Long spouseMoM = zInfoUserService.getById(user.getSpouseId()).getMomId();
- Long spouseDad = zInfoUserService.getById(user.getSpouseId()).getFatherId();
- zu.setMomId(spouseMoM);
- zu.setFatherId(spouseDad);
-
+// Long spouseMoM = zInfoUserService.getById(user.getSpouseId()).getMomId();
+// Long spouseDad = zInfoUserService.getById(user.getSpouseId()).getFatherId();
+// zu.setMomId(spouseMoM);
+// zu.setFatherId(spouseDad);
+//
zInfoUserService.updateById(zu);
+
+ //鏇存柊MarrySelf鍜孧arryUser
+ ZInfoUser zfi = zInfoUserService.getById(user.getUserId());
+ MarrySelf marrySelf = new MarrySelf();
+ marrySelf.setUid(user.getSpouseId());
+ marrySelf.setName(zfi.getOldName());
+ marrySelf.setSpouseSex(zfi.getSex()==1?"鐢�":"濂�");
+ //杩欎釜鍙兘杩樿淇敼 涓�涓�
+ marrySelf.setMarryStatus(0);
+ marrySelf.setSpouseName(infoUser.getOldName());
+ marrySelf.setSpouseSex(infoUser.getSex()==1?"鐢�":"濂�");
+ marrySelf.setSpouseMarryStatus(0);
+ marrySelfService.saveOrUpdate(marrySelf);
+ //澧炲姞MarryUser
+ //澧炲姞marryUser
+ MarryUser marryUser = new MarryUser();
+ marryUser.setUid(user.getSpouseId());
+ marryUser.setName(infoUser.getOldName());
+ marryUser.setSex(infoUser.getSex()==1?"鐢�":"濂�");
+ marryUser.setMarryStatus(0);
+ marryUserService.addData(marryUser);
+
}
return AjaxResult.success();
@@ -358,6 +392,8 @@
//
// }
if (userAll.getFid() != null && userAll.getMid() != null){
+ //璇佹槑鏄湰瀹剁殑涓�涓�,澧炲姞杩涙潵鐨�
+
ZInfoUser father = zInfoUserService.getById(userAll.getFid());
ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
//濡傛灉鏄湰瀹讹紝灏辩畝鍘嗕竴涓搴彿
@@ -369,12 +405,37 @@
// infoUser.setFamilyId(mother.getFamilyId());
infoUser.setClanId(mother.getClanId());
- }
+ }
+ MarrySelf marrySelf = new MarrySelf();
+ marrySelf.setName(infoUser.getOldName());
+ marrySelf.setSex(infoUser.getSex()==1?"鐢�":"濂�");
+ marrySelf.setMarryStatus(0);
+ marrySelfService.save(marrySelf);
}
else {
ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
infoUser.setFamilyId(spouse.getFamilyId());
infoUser.setClanId(spouse.getClanId());
+ //閫氳繃閰嶅伓鐨勪俊鎭紝鏇存柊marrySelf鍜屽鍔爉arryUser琛�
+ MarrySelf marrySelf = new MarrySelf();
+ // marrySelf.setUid(userAll.getSpouseId());
+ marrySelf.setSpouseName(infoUser.getOldName());
+ marrySelf.setSpouseSex(infoUser.getSex()==1?"鐢�":"濂�");
+ marrySelf.setMarryStatus(1);
+ //淇敼鏉′欢
+ QueryWrapper<MarrySelf> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("uid", userAll.getSpouseId());
+
+
+ marrySelfService.update(marrySelf, queryWrapper);
+ //澧炲姞marryUser
+ MarryUser marryUser = new MarryUser();
+ marryUser.setUid(userAll.getSpouseId());
+ marryUser.setName(infoUser.getOldName());
+ marryUser.setSex(infoUser.getSex()==1?"鐢�":"濂�");
+ marryUser.setMarryStatus(0);
+ marryUserService.addData(marryUser);
+
}
//鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖
@@ -389,6 +450,7 @@
zInfoUserService.save(infoUser);
if(userAll.getSpouseId()!=null)
{
+ //鏇存柊閰嶅伓淇℃伅
ZInfoUser zu = new ZInfoUser();
zu.setUserId(userAll.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
--
Gitblit v1.9.1