From 98cd4713254614381ede8fa42d0820a3ffc1d53e Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期五, 18 十月 2024 10:36:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 90 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 69 insertions(+), 21 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 c35bcf9..5546b45 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 @@ -88,6 +88,8 @@ public TableDataInfo list(SysUser user) { startPage(); + System.out.println(user.getClanId()); + System.out.println("----------------++++++++++++==0------------"); List<SysUser> list = userService.selectUserList(user); return getDataTable(list); } @@ -128,7 +130,7 @@ @GetMapping(value = { "/", "/{userId}" }) public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) { - userService.checkUserDataScope(userId); + // userService.checkUserDataScope(userId); AjaxResult ajax = AjaxResult.success(); List<SysRole> roles = roleService.selectRoleAll(); //濡傛灉鏄痑dmin鍒欑洿鎺ヨ繑鍥炴墍鏈夌殑瑙掕壊锛屽惁鍒欏氨杩斿洖涓嶆槸绠$悊鍛樼殑瑙掕壊淇℃伅 @@ -166,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()); @@ -190,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) @@ -204,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(); + } /** * 鏂板鐢ㄦ埛 @@ -246,12 +282,14 @@ user.setSex(userAll.getSex()); user.setRemark(userAll.getRemark()); user.setUpdateBy(userAll.getUpdateBy()); + user.setClanId(userAll.getClanId()); // user.setSex(userAll.getSex()=="鐢�"?"1":"0"); // user.setPostIds(userAll.getPostIds()); // user.set - 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)) { @@ -282,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()); @@ -313,7 +355,8 @@ ZInfoUser mother = zInfoUserService.getById(userAll.getMid()); if (father.getIsMyFamily() == 1){ infoUser.setFamilyId(father.getFamilyId()); - infoUser.setClanId(father.getClanId());} + infoUser.setClanId(father.getClanId()); + } else if (mother.getIsMyFamily() == 1){ infoUser.setFamilyId(mother.getFamilyId()); infoUser.setClanId(mother.getClanId()); @@ -333,7 +376,7 @@ // if(userAll.getFamilyId()!=-1) { - if(userAll.getRoleId()==102) { + if(userAll.getRoleId().equals(102L)) { infoUser.setRoleId(3L); zInfoUserService.save(infoUser); if(userAll.getSpouseId()!=null) @@ -341,9 +384,14 @@ 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); } - }} + } + } // zInfoUserService.saveOrUpdate(infoUser); // LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); @@ -374,9 +422,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)) { @@ -417,8 +465,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