修改了权限的代码

feige

2024-06-22 5cdf5c84b04951a6fe43fbe622335f0a14b44f77

 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,73 @@
        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();
            if(userAll.getSpouseId()!=null)
            {
                ZInfoUser zu = new ZInfoUser();
                zu.setUserId(userAll.getSpouseId());
                zu.setSpouseId(infoUser.getUserId());
                zInfoUserService.updateById(zu);
            }
        }
        //    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 +322,7 @@
//        for(Long uid: userIds) {
//            zInfoUserService.getInfoBysysId();
//        }
        zInfoUserService.removeByUserName( userService.findUserNames(userIds));
       // zInfoUserService.removeByUserName( userService.findUserNames(userIds));
        return toAjax(userService.deleteUserByIds(userIds));
    }