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 | 139 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 136 insertions(+), 3 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 2cb0e8f..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 @@ -1,10 +1,20 @@ package com.ruoyi.web.controller.system; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.domain.entity.sysUserInfo; +import com.ruoyi.domain.ZInfoUser; +import com.ruoyi.domain.ZfFamily; +import com.ruoyi.domain.sysUserAndUserInfo; +import com.ruoyi.service.ZInfoUserService; +import com.ruoyi.service.ZfFamilyService; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -54,7 +64,10 @@ @Autowired private ISysPostService postService; - + @Resource + private ZInfoUserService zInfoUserService; + @Resource + private ZfFamilyService zfFamilyService; /** * 鑾峰彇鐢ㄦ埛鍒楄〃 */ @@ -120,13 +133,68 @@ } /** + * 淇敼鐢ㄦ埛 + * + */ + @PreAuthorize("@ss.hasPermi('system:user:edit')") + @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.UPDATE) + @PostMapping("/updateUserInfo") + public AjaxResult editUser(@Validated @RequestBody sysUserAndUserInfo user) + { + 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("[[[[]]]]]]"); + ZInfoUser infoUser = new ZInfoUser(); + infoUser.setUserId(user.getUserId()); + infoUser.setOldName(user.getUserName()); + infoUser.setIsMyFamily(user.getIsMyFamily()); + 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()); + zInfoUserService.saveOrUpdate(infoUser); + // zInfoUserService.update(infoUser); + // .saveOrUpdate(infoUser); + return AjaxResult.success(); + } + /** * 鏂板鐢ㄦ埛 */ @PreAuthorize("@ss.hasPermi('system:user:add')") @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysUser user) + public AjaxResult add(@Validated @RequestBody sysUserAndUserInfo userAll) { + SysUser user = new SysUser(); + // user.setUserId(userAll.getUserId()); + user.setAvatar(userAll.getAvatar()); + user.setPassword("123456"); + user.setNickName(userAll.getNickName()); + user.setUserName(userAll.getUserName()); + user.setPhonenumber(userAll.getPhonenumber()); + user.setRoleId(userAll.getRoleId()); + user.setRoleIds(userAll.getRoleIds()); + user.setStatus(userAll.getStatus()); + user.setSex(userAll.getSex()); + user.setRemark(userAll.getRemark()); + user.setUpdateBy(userAll.getUpdateBy()); + // user.setPostIds(userAll.getPostIds()); + // user.set if (!userService.checkUserNameUnique(user)) { return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪"); @@ -141,7 +209,68 @@ } user.setCreateBy(getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - return toAjax(userService.insertUser(user)); + userService.insertUser(user); + //鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈� +// +// ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId()); + ZInfoUser infoUser = new ZInfoUser(); + infoUser.setSysId(user.getUserId()); + // infoUser.setUserId(user.getUserId()); + 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()); + + infoUser.setIsMyFamily(userAll.getIsMyFamily()); +// if(userAll.getSpouseId()==0) +// infoUser.setSpouseId(null); +// else { +// infoUser.setSpouseId(userAll.getSpouseId()); +// +// } + //鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖ + // if(user.getRoleIds()[0]==102) + + // infoUser.setRoleName(user.g); + + // 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(); +// } + // } + return AjaxResult.success(); } /** @@ -182,6 +311,10 @@ { return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎"); } +// for(Long uid: userIds) { +// zInfoUserService.getInfoBysysId(); +// } + // zInfoUserService.removeByUserName( userService.findUserNames(userIds)); return toAjax(userService.deleteUserByIds(userIds)); } -- Gitblit v1.9.1