代码提交

无关风月

2024-11-12 3ec572e2cb7adf7d33d2018b24c003d9ef18906a

 xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysUserController.java

@@ -74,6 +74,15 @@
    private ISysPermissionService permissionService;
    @Resource
    private ISysUserDeptService sysUserDeptService;


    @PostMapping("/removeByAppUserId/{id}")
    public AjaxResult removeByAppUserId(@PathVariable("id") Long id)
    {
        SysUser byId = userService.getById(id);
        userService.removeById(byId);
        return AjaxResult.success();
    }
    /**
     * 获取用户列表
     */
@@ -150,6 +159,8 @@
        user.setUpdateTime(LocalDateTime.now());
        if (user.getPassword()!=null){
            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));

            return AjaxResult.success(userService.resetPwd(user));
        }

        return AjaxResult.success(userService.updateUser(user));
@@ -163,6 +174,7 @@
        user.setUserId(dto.getUserId());
        user.setStatus(String.valueOf(dto.getStatus()));
        user.setReason(dto.getReason());
        user.setDisableTime(LocalDateTime.now());
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = userService.selectUserById(userid);
        user.setUpdateBy(sysUser.getNickName()+"("+sysUser.getUserName()+")");
@@ -591,9 +603,7 @@
    @PostMapping("/app-register")
    public R<SysUser> appRegister(@RequestBody SysUser sysUser) {
        String username = sysUser.getUserName();
        if (!userService.checkAppUserNameUnique(sysUser)) {
            return R.fail("保存用户'" + username + "'失败，注册账号已存在");
        }

        //添加用户
        userService.registerUser(sysUser);
        return R.ok(sysUser);
@@ -604,12 +614,9 @@
    /**
     * 重置密码
     */
    @RequiresPermissions("system:user:edit")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping("/resetPwd")
    @PostMapping("/resetPwd")
    public AjaxResult resetPwd(@RequestBody SysUser user) {
        userService.checkUserAllowed(user);
        userService.checkUserDataScope(user.getUserId());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        user.setUpdateBy(SecurityUtils.getUsername());
        return toAjax(userService.resetPwd(user));