Bladeren bron

feat(user): 修改手机号查询用户接口支持用户类型参数

- 移除无用的Null导入和未使用的菜单、角色相关服务
- 修改selectUserByPhonenumber方法增加type参数
- 更新控制器层接口映射方式从路径变量改为请求参数
- 在查询条件中添加用户子类型过滤逻辑
- 优化接口调用参数传递方式
hurx 1 maand geleden
bovenliggende
commit
3fb66c30a3

+ 4 - 9
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/pc/PcSysUserController.java

@@ -10,17 +10,11 @@ import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 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.service.ISysMenuService;
-import org.dromara.system.service.ISysRoleService;
 import org.dromara.system.service.ISysUserService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @Validated
 @RequiredArgsConstructor
 @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)) {
             return R.fail("手机号不能为空");
         }
 
-        SysUserVo user = sysUserService.selectUserByPhonenumber(phonenumber);
+        SysUserVo user = sysUserService.selectUserByPhonenumber(phonenumber, type);
         if (user != null) {
             // 可选:返回用户信息,前端可提示“该手机号已注册”
             return R.fail("该手机号已注册");

+ 1 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java

@@ -1,6 +1,5 @@
 package org.dromara.system.service;
 
-import org.apache.ibatis.jdbc.Null;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.system.domain.bo.SysUserBo;
@@ -63,7 +62,7 @@ public interface ISysUserService {
      * @param phonenumber 手机号
      * @return 用户对象信息
      */
-    SysUserVo selectUserByPhonenumber(String phonenumber);
+    SysUserVo selectUserByPhonenumber(String phonenumber, String type);
 
     /**
      * 通过用户ID查询用户

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -169,8 +169,8 @@ public class SysUserServiceImpl implements ISysUserService {
      * @return 用户对象信息
      */
     @Override
-    public SysUserVo selectUserByPhonenumber(String phonenumber) {
-        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber));
+    public SysUserVo selectUserByPhonenumber(String phonenumber, String type) {
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber).eq(SysUser::getUserSonType, type));
     }
 
     /**