From 4a353896e3ab74e6bd9acda6bebc2fde167f2d00 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 23 三月 2022 00:33:28 +0800 Subject: [PATCH] add 增加 短信登录 与 小程序登录 示例 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 8fca17b..11ff7b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -15,6 +15,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.helper.DataBaseHelper; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysPost; @@ -80,10 +81,10 @@ .and(ObjectUtil.isNotNull(user.getDeptId()), w -> { List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>() .select(SysDept::getDeptId) - .apply("find_in_set({0},ancestors)", user.getDeptId())); - w.eq("u.dept_id", user.getDeptId()) - .or() - .in("u.dept_id", deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList())); + .apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors"))); + List<Long> ids = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()); + ids.add(user.getDeptId()); + w.in("u.dept_id", ids); }); return wrapper; } @@ -137,6 +138,17 @@ } /** + * 閫氳繃鎵嬫満鍙锋煡璇㈢敤鎴� + * + * @param phonenumber 鎵嬫満鍙� + * @return 鐢ㄦ埛瀵硅薄淇℃伅 + */ + @Override + public SysUser selectUserByPhonenumber(String phonenumber) { + return baseMapper.selectUserByPhonenumber(phonenumber); + } + + /** * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛 * * @param userId 鐢ㄦ埛ID -- Gitblit v1.9.3