This commit is contained in:
dute7liang
2024-01-04 23:10:02 +08:00
parent 04f4861912
commit 54801cc546
15 changed files with 73 additions and 139 deletions

View File

@@ -4,7 +4,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.domain.UserCodeGen;
import com.ruoyi.cai.dto.admin.query.ResetPasswordReq;
import com.ruoyi.cai.dto.admin.query.UpdateMobileAdminReq;
import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
@@ -26,9 +25,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -125,7 +122,7 @@ public class UserController extends BaseController {
@PostMapping("/resetPwd")
public R<Void> resetPwd(@RequestBody ResetPasswordReq req) {
User user = userService.getById(req.getUserId());
userService.resetPassword(user.getMobile(),user.getPassword());
userService.resetPassword(req.getUserId(),user.getPassword());
return R.ok();
}

View File

@@ -1,7 +1,6 @@
package com.ruoyi.cai.controller.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.UserInvite;
import com.ruoyi.cai.dto.admin.vo.UserInviteAdminVo;
@@ -13,7 +12,6 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -70,24 +68,6 @@ public class UserInviteController extends BaseController {
return toAjax(userInviteService.save(bo));
}
@SaCheckPermission("cai:userInvite:edit")
@Log(title = "用户邀请", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PostMapping("/updateRate")
public R<Void> updateUserInviteRate(@RequestBody UserInvite bo) {
return toAjax(userInviteService.updateUserInviteRate(bo));
}
/**
* 修改用户邀请
*/
@SaCheckPermission("cai:userInvite:edit")
@Log(title = "用户邀请", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserInvite bo) {
return toAjax(userInviteService.updateById(bo));
}
/**
* 删除用户邀请