From 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期日, 16 六月 2024 13:45:39 +0800 Subject: [PATCH] 修改了权限的代码 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 115 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 64 insertions(+), 51 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 3697614..724ce96 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 @@ -143,26 +143,30 @@ { SysUser us = new SysUser(); us.setUserId(user.getSysId()); + us.setUserName(user.getUserName()); us.setNickName(user.getNickName()); us.setRoleId(user.getRoleId()); us.setSex(user.getSex()); us.setStatus(user.getStatus()); userService.updateUser(us); - System.out.println(user.getFamilyId()); + // System.out.println(user.getFamilyId()); // System.out.println("[[[[]]]]]]"); ZInfoUser infoUser = new ZInfoUser(); infoUser.setUserId(user.getUserId()); + infoUser.setOldName(user.getUserName()); infoUser.setIsMyFamily(user.getIsMyFamily()); - infoUser.setFamilyId(user.getFamilyId()); + infoUser.setMomId(user.getMid()); + infoUser.setFatherId(user.getFid()); +// infoUser.setFamilyId(user.getFamilyId()); infoUser.setSysId(user.getSysId()); 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()); +// 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); // zInfoUserService.update(infoUser); // .saveOrUpdate(infoUser); @@ -174,12 +178,12 @@ @PreAuthorize("@ss.hasPermi('system:user:add')") @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody sysUserInfo userAll) + public AjaxResult add(@Validated @RequestBody sysUserAndUserInfo userAll) { SysUser user = new SysUser(); - user.setUserId(userAll.getUserId()); + // user.setUserId(userAll.getUserId()); user.setAvatar(userAll.getAvatar()); - user.setPassword(userAll.getPassword()); + user.setPassword("123456"); user.setNickName(userAll.getNickName()); user.setUserName(userAll.getUserName()); user.setPhonenumber(userAll.getPhonenumber()); @@ -189,7 +193,7 @@ user.setSex(userAll.getSex()); user.setRemark(userAll.getRemark()); user.setUpdateBy(userAll.getUpdateBy()); - user.setPostIds(userAll.getPostIds()); + // user.setPostIds(userAll.getPostIds()); // user.set if (!userService.checkUserNameUnique(user)) { @@ -207,56 +211,65 @@ user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); userService.insertUser(user); //鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈� - - ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId()); +// +// ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId()); ZInfoUser infoUser = new ZInfoUser(); infoUser.setSysId(user.getUserId()); // infoUser.setUserId(user.getUserId()); - infoUser.setNickName(user.getNickName()); - infoUser.setPhoneNumber(user.getPhonenumber()); - infoUser.setSex(user.getSex()=="鐢�"?1:0); - infoUser.setFamilyId(userAll.getFamilyId()); - if(zfFamily!=null&&zfFamily.getFid()!=null) { - infoUser.setFatherId(zfFamily.getFid()); - // infoUser.setMomId(zfFamily.getMid()); - } - if(zfFamily!=null&&zfFamily.getMid()!=null) { - infoUser.setFatherId(zfFamily.getMid()); - // infoUser.setMomId(zfFamily.getMid()); - } + infoUser.setNickName(userAll.getNickName()); + infoUser.setOldName(userAll.getUserName()); + infoUser.setPhoneNumber(userAll.getPhonenumber()); + 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()); + +// if(zfFamily!=null&&zfFamily.getFid()!=null) { +// infoUser.setFatherId(zfFamily.getFid()); +// // infoUser.setMomId(zfFamily.getMid()); +// } +// if(zfFamily!=null&&zfFamily.getMid()!=null) { +// infoUser.setFatherId(zfFamily.getMid()); +// // infoUser.setMomId(zfFamily.getMid()); +// } System.out.println("-----"); System.out.println(userAll.getIsMyFamily()); - System.out.println(userAll.getFamilyId()); - infoUser.setIsMyFamily(userAll.getIsMyFamily()); - if(userAll.getSpouseId()==0) - infoUser.setSpouseId(null); - else { - infoUser.setSpouseId(userAll.getSpouseId()); - } + infoUser.setIsMyFamily(userAll.getIsMyFamily()); +// if(userAll.getSpouseId()==0) +// infoUser.setSpouseId(null); +// else { +// infoUser.setSpouseId(userAll.getSpouseId()); +// +// } //鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖ - if(user.getRoleIds()[0]==102) - infoUser.setRoleId(3L); + // if(user.getRoleIds()[0]==102) + // infoUser.setRoleName(user.g); - if(userAll.getFamilyId()!=-1) { + // if(userAll.getFamilyId()!=-1) { + if(userAll.getRoleId()==102) { + infoUser.setRoleId(3L); zInfoUserService.save(infoUser); - // zInfoUserService.saveOrUpdate(infoUser); - LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); - lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId()); - List<ZInfoUser> lis = zInfoUserService.list(lqw); - if(lis.size()>0) { -// ZInfoUser zi = new ZInfoUser(); -// zi.setUserId(userAll.getSpouseId()); -// // UpdateWrapper wrapper = new UpdateWrapper(); -// zi.setSpouseId(lis.get(0).getUserId()); -// System.out.println(userAll.getSpouseId()); -// System.out.println(lis.get(0).getUserId()); - zInfoUserService.lambdaUpdate().eq(ZInfoUser::getUserId, userAll.getSpouseId()) - .set(ZInfoUser::getSpouseId, lis.get(0).getUserId()) - .update(); - } } + // zInfoUserService.saveOrUpdate(infoUser); +// LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); +// lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId()); +// List<ZInfoUser> lis = zInfoUserService.list(lqw); +// if(lis.size()>0) { +//// ZInfoUser zi = new ZInfoUser(); +//// zi.setUserId(userAll.getSpouseId()); +//// // UpdateWrapper wrapper = new UpdateWrapper(); +//// zi.setSpouseId(lis.get(0).getUserId()); +//// System.out.println(userAll.getSpouseId()); +//// System.out.println(lis.get(0).getUserId()); +// zInfoUserService.lambdaUpdate().eq(ZInfoUser::getUserId, userAll.getSpouseId()) +// .set(ZInfoUser::getSpouseId, lis.get(0).getUserId()) +// .update(); +// } + // } return AjaxResult.success(); } @@ -301,7 +314,7 @@ // for(Long uid: userIds) { // zInfoUserService.getInfoBysysId(); // } - zInfoUserService.removeByUserName( userService.findUserNames(userIds)); + // zInfoUserService.removeByUserName( userService.findUserNames(userIds)); return toAjax(userService.deleteUserByIds(userIds)); } -- Gitblit v1.9.1