|
@@ -10,17 +10,11 @@ import org.dromara.common.redis.utils.RedisUtils;
|
|
|
import org.dromara.common.satoken.utils.LoginHelper;
|
|
import org.dromara.common.satoken.utils.LoginHelper;
|
|
|
import org.dromara.common.web.core.BaseController;
|
|
import org.dromara.common.web.core.BaseController;
|
|
|
import org.dromara.system.domain.bo.ChangeUserPwdBo;
|
|
import org.dromara.system.domain.bo.ChangeUserPwdBo;
|
|
|
-import org.dromara.system.domain.vo.SysMenuVo;
|
|
|
|
|
-import org.dromara.system.domain.vo.SysRoleVo;
|
|
|
|
|
import org.dromara.system.domain.vo.SysUserVo;
|
|
import org.dromara.system.domain.vo.SysUserVo;
|
|
|
-import org.dromara.system.service.ISysMenuService;
|
|
|
|
|
-import org.dromara.system.service.ISysRoleService;
|
|
|
|
|
import org.dromara.system.service.ISysUserService;
|
|
import org.dromara.system.service.ISysUserService;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-
|
|
|
|
|
@Validated
|
|
@Validated
|
|
|
@RequiredArgsConstructor
|
|
@RequiredArgsConstructor
|
|
|
@RestController
|
|
@RestController
|
|
@@ -33,13 +27,14 @@ public class PcSysUserController extends BaseController {
|
|
|
/**
|
|
/**
|
|
|
* 根据手机号查询用户(用于注册前校验)
|
|
* 根据手机号查询用户(用于注册前校验)
|
|
|
*/
|
|
*/
|
|
|
- @GetMapping("/selectByPhone/{phonenumber}")
|
|
|
|
|
- public R<SysUserVo> selectUserByPhonenumber(@PathVariable String phonenumber) {
|
|
|
|
|
|
|
+ @GetMapping("/selectByPhone")
|
|
|
|
|
+ public R<SysUserVo> selectUserByPhonenumber(@RequestParam String phonenumber,
|
|
|
|
|
+ @RequestParam String type) {
|
|
|
if (StringUtils.isEmpty(phonenumber)) {
|
|
if (StringUtils.isEmpty(phonenumber)) {
|
|
|
return R.fail("手机号不能为空");
|
|
return R.fail("手机号不能为空");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- SysUserVo user = sysUserService.selectUserByPhonenumber(phonenumber);
|
|
|
|
|
|
|
+ SysUserVo user = sysUserService.selectUserByPhonenumber(phonenumber, type);
|
|
|
if (user != null) {
|
|
if (user != null) {
|
|
|
// 可选:返回用户信息,前端可提示“该手机号已注册”
|
|
// 可选:返回用户信息,前端可提示“该手机号已注册”
|
|
|
return R.fail("该手机号已注册");
|
|
return R.fail("该手机号已注册");
|