From 81995abfa712d65b7f7f1e23b97a97bc4065103d Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 25 十月 2024 23:11:30 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 1ba96ad..8a6eac9 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
@@ -221,7 +221,7 @@
// infoUser.setFamilyId(mother.getFamilyId());
// }
if (user.getSpouseId() != null){
- if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
+// if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
//鏄湰瀹�
if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
@@ -229,7 +229,7 @@
System.out.println("33333333333333333333333333333333333333333/");
infoUser.setFamilyId(spouse.getFamilyId());
infoUser.setClanId(spouse.getClanId());
- }
+// }
}}
if(infoUser.getFamilyId()!=null)
zInfoUserService.saveOrUpdate(infoUser);
@@ -242,6 +242,11 @@
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);
+
zInfoUserService.updateById(zu);
}
@@ -339,6 +344,13 @@
// System.out.println(userAll.getIsMyFamily());
infoUser.setIsMyFamily(userAll.getIsMyFamily());
+ if(userAll.getIsMyFamily()==1)
+ {
+ ZfFamily zfFamily = new ZfFamily();
+ zfFamily.setName(userAll.getNickName()+"鐨勫搴�");
+ zfFamilyService.addFamily(zfFamily);
+ infoUser.setFamilyId(zfFamily.getId());
+ }
// if(userAll.getSpouseId()==0)
// infoUser.setSpouseId(null);
// else {
@@ -348,12 +360,13 @@
if (userAll.getFid() != null && userAll.getMid() != null){
ZInfoUser father = zInfoUserService.getById(userAll.getFid());
ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
+ //濡傛灉鏄湰瀹讹紝灏辩畝鍘嗕竴涓搴彿
if (father.getIsMyFamily() == 1){
- infoUser.setFamilyId(father.getFamilyId());
+ // infoUser.setFamilyId(father.getFamilyId());
infoUser.setClanId(father.getClanId());
}
else if (mother.getIsMyFamily() == 1){
- infoUser.setFamilyId(mother.getFamilyId());
+ // infoUser.setFamilyId(mother.getFamilyId());
infoUser.setClanId(mother.getClanId());
}
@@ -379,6 +392,10 @@
ZInfoUser zu = new ZInfoUser();
zu.setUserId(userAll.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
+ Long spouseMoM = zInfoUserService.getById(userAll.getSpouseId()).getMomId();
+ Long spouseDad = zInfoUserService.getById(userAll.getSpouseId()).getFatherId();
+ zu.setMomId(spouseMoM);
+ zu.setFatherId(spouseDad);
zInfoUserService.updateById(zu);
}
}
@@ -456,8 +473,8 @@
@PutMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody SysUser user)
{
- userService.checkUserAllowed(user);
- userService.checkUserDataScope(user.getUserId());
+ // userService.checkUserAllowed(user);
+// userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(getUsername());
return toAjax(userService.resetPwd(user));
--
Gitblit v1.9.1