bug修改

xuhy

2 天以前 dda2e3f49fe9c942fb6a487204ff8c8e66e46a12

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -12,6 +12,7 @@
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -201,11 +202,42 @@
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword("123456"));
        user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
        user.setUserIdentification(CodeGenerateUtils.generateVolumeSn());
        userService.insertUser(user);
        return R.ok();
    }

    /**
     * 账号继承
     */
    // @PreAuthorize("@ss.hasPermi('system:user:add')")
    @ApiOperation(value = "账号继承,userId:继承账号id,oldUserId:老账号id",response = SysUser.class)
    @Log(title = "用户信息-账号继承", businessType = BusinessType.UPDATE)
    @PutMapping("/open/system/user/inherit")
    public R<String> inherit(@RequestParam Long userId,
                             @RequestParam Long oldUserId)
    {
        // 查询老帐号
        SysUser oldUser = userService.selectUserById(oldUserId);
        if (Objects.isNull(oldUser)){
            return R.fail("原始账号不存在");
        }
        SysUser user = userService.selectUserById(userId);
        if (Objects.isNull(user)){
            return R.fail("继承账号不存在");
        }
        Long oldUserUserId = oldUser.getUserId();
        List<SysUser> oldUserList = userService.selectOldList();
//        oldUser.setUserId();
//        userService.updateUserOldUser(oldUser);
        user.setParentId(oldUser.getUserId());
        user.setParentAccount(oldUser.getUserName());

//        userService.updateUserInherit(user);
        return R.ok();
    }

    /**
     * 修改用户
     */
    // @PreAuthorize("@ss.hasPermi('system:user:edit')")