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 | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 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 46d357b..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
@@ -168,8 +168,11 @@
// System.out.println(user.getFamilyId());
// System.out.println("[[[[]]]]]]");
Long userId = user.getSysId();
- SysUserRole sysUserRole=sysUserRoleMapper.selectUserById(userId);
- if (sysUserRole.getRoleId() == 102){
+ // SysUserRole sysUserRole=sysUserRoleMapper.selectUserById(userId);
+ //System.out.println(sysUserRole.getRoleId());
+ System.out.println("浣犲ソ鍛�");
+ System.out.println(user.getRoleId());
+ if (user.getRoleId().equals(102L)){
ZInfoUser infoUser = new ZInfoUser();
infoUser.setUserId(user.getUserId());
infoUser.setOldName(user.getUserName());
@@ -192,13 +195,25 @@
// infoUser.setMomId(zfFamily.getMid());
if (user.getFid() != null){
- if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
+ //璺熼殢鐖朵翰鐨勫鏃忓拰瀹跺涵淇℃伅
+ // if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
ZInfoUser father = zInfoUserService.getById(user.getFid());
System.out.println("11111111111111111111111111111111/");
infoUser.setFamilyId(father.getFamilyId());
infoUser.setClanId(father.getClanId());
- }}
+ // }
+ }
+
+ if(user.getMid()!=null)
+ {
+ //璺熼殢姣嶄翰鐨勫鏃忓拰瀹跺涵淇℃伅
+ // if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
+ ZInfoUser mother = zInfoUserService.getById(user.getMid());
+ System.out.println("11111111111111111111111111111111/");
+ infoUser.setFamilyId(mother.getFamilyId());
+ infoUser.setClanId(mother.getClanId());
+ }
// else if(user.getMid() != null){
// ZInfoUser mother = zInfoUserService.getById(user.getMid());
// if (mother.getIsMyFamily() == 1)
@@ -206,26 +221,45 @@
// 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) {
ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
System.out.println("33333333333333333333333333333333333333333/");
infoUser.setFamilyId(spouse.getFamilyId());
infoUser.setClanId(spouse.getClanId());
- }
+// }
}}
-
- zInfoUserService.saveOrUpdate(infoUser);
+ if(infoUser.getFamilyId()!=null)
+ zInfoUserService.saveOrUpdate(infoUser);
+ else {
+ System.out.println("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ return AjaxResult.success("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ }
+ //鏇存柊閰嶅伓淇℃伅
if(user.getSpouseId()!=null) {
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);
- }}
+ }
+
+ return AjaxResult.success();
+ }
+ else {
+ System.out.println("daniuni");
+ return AjaxResult.success("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ }
// zInfoUserService.update(infoUser);
// .saveOrUpdate(infoUser);
- return AjaxResult.success();
+
}
/**
* 鏂板鐢ㄦ埛
@@ -286,7 +320,11 @@
infoUser.setNickName(userAll.getNickName());
infoUser.setOldName(userAll.getUserName());
infoUser.setPhoneNumber(userAll.getPhonenumber());
- infoUser.setSex(userAll.getSex()=="鐢�"?1:0);
+ System.out.println(userAll.getSex());
+ System.out.println("鎬у埆鐨勫師鍥�");
+
+ infoUser.setSex(userAll.getSex().equals("0")?0:1);
+ System.out.println(infoUser.getSex());
// infoUser.setFamilyId(userAll.getFid());
infoUser.setSpouseId(userAll.getSpouseId());
@@ -306,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 {
@@ -315,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());
}
@@ -338,7 +384,7 @@
// if(userAll.getFamilyId()!=-1) {
- if(userAll.getRoleId()==102) {
+ if(userAll.getRoleId().equals(102L)) {
infoUser.setRoleId(3L);
zInfoUserService.save(infoUser);
if(userAll.getSpouseId()!=null)
@@ -346,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);
}
}
@@ -380,9 +430,9 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
- if (!userService.checkUserNameUnique(user))
+ if (!userService.checkNickNameUnique(user))
{
- return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ return error("淇敼鐢ㄦ埛'" + user.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
{
@@ -423,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