From f0a74544e0ab2ee3d191a3d46bd82a0274d67b6d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 25 六月 2024 20:29:26 +0800
Subject: [PATCH] 配偶过滤掉子孙和同性
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 724ce96..a184b4b 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
@@ -152,22 +152,30 @@
// System.out.println(user.getFamilyId());
// System.out.println("[[[[]]]]]]");
- ZInfoUser infoUser = new ZInfoUser();
+ ZInfoUser infoUser = new ZInfoUser();
infoUser.setUserId(user.getUserId());
infoUser.setOldName(user.getUserName());
+ infoUser.setNickName(user.getNickName());
infoUser.setIsMyFamily(user.getIsMyFamily());
infoUser.setMomId(user.getMid());
infoUser.setFatherId(user.getFid());
// infoUser.setFamilyId(user.getFamilyId());
infoUser.setSysId(user.getSysId());
- if(user.getSpouseId()!=null)
+ if(user.getSpouseId()!=null) {
infoUser.setSpouseId(user.getSpouseId());
+ }
// ZfFamily zfFamily = zfFamilyService.getByFamId(user.getFamilyId());
// if(zfFamily!=null&&zfFamily.getFid()!=null)
// infoUser.setFatherId(zfFamily.getFid());
// if(zfFamily!=null&&zfFamily.getMid()!=null)
// infoUser.setMomId(zfFamily.getMid());
zInfoUserService.saveOrUpdate(infoUser);
+ if(user.getSpouseId()!=null) {
+ ZInfoUser zu = new ZInfoUser();
+ zu.setUserId(user.getSpouseId());
+ zu.setSpouseId(infoUser.getUserId());
+ zInfoUserService.updateById(zu);
+ }
// zInfoUserService.update(infoUser);
// .saveOrUpdate(infoUser);
return AjaxResult.success();
@@ -222,6 +230,7 @@
infoUser.setSex(userAll.getSex()=="鐢�"?1:0);
infoUser.setFamilyId(userAll.getFid());
infoUser.setSpouseId(userAll.getSpouseId());
+
infoUser.setFatherId(userAll.getFid());
infoUser.setMomId(userAll.getMid());
// infoUser.setFamilyId(userAll.getFamilyId());
@@ -253,6 +262,13 @@
if(userAll.getRoleId()==102) {
infoUser.setRoleId(3L);
zInfoUserService.save(infoUser);
+ if(userAll.getSpouseId()!=null)
+ {
+ ZInfoUser zu = new ZInfoUser();
+ zu.setUserId(userAll.getSpouseId());
+ zu.setSpouseId(infoUser.getUserId());
+ zInfoUserService.updateById(zu);
+ }
}
// zInfoUserService.saveOrUpdate(infoUser);
// LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
--
Gitblit v1.9.1