From 968740acfa073fe271f92373edcb33c67353021d Mon Sep 17 00:00:00 2001 From: DELL Date: Sat, 30 Mar 2024 14:02:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A8=A1=E5=9D=97=5F=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E6=AD=A3=E7=A1=AE=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=94=A8=E6=88=B7=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/base/service/UserTokenService.java | 8 +++++ .../service/impl/SmsLoginServiceImpl.java | 2 +- .../xiaoyao/admin/service/UserService.java | 7 ++++ .../admin/service/impl/UserServiceImpl.java | 32 +++++++++++++++++++ .../service/impl/UserTokenServiceImpl.java | 18 +++++++++++ 5 files changed, 66 insertions(+), 1 deletion(-) diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java index 8a2083f3..c762dd4b 100644 --- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java +++ b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java @@ -22,6 +22,14 @@ public interface UserTokenService { * @return 返回用户数据库对象 */ User findByLoginname(String loginname); + + /** + * 查询用户对象 + * @param phone 登录手机号 + * @return 返回用户数据库对象 + */ + User findByPhone(String phone); + /** * 查询用户对象 * @param userid 用户主键 diff --git a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java index 695110f3..38e6f497 100644 --- a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java +++ b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java @@ -114,7 +114,7 @@ public class SmsLoginServiceImpl implements SmsLoginService { } //数据库查询用户对象 - User user = userTokenService.findByLoginname(phone); + User user = userTokenService.findByPhone(phone); if(null == user){ return ResultVoUtil.error("用户错误。"); } diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserService.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserService.java index c3a1760c..b999c962 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserService.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserService.java @@ -23,6 +23,13 @@ public interface UserService extends BaseService { * @return 用户对象 */ public User findByLoginname(String loginname); + + /** + * 根据登录手机号查询用户信息 + * @param phone 登录手机号 + * @return 用户对象 + */ + public User findByPhone(String phone); /** * 根据主键查询用户信息 diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java index 6ac4f6b5..ba68dfa8 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java @@ -112,6 +112,38 @@ public class UserServiceImpl extends BaseServiceImpl imple user.setFrontmenuTList(frontmenuTList1); return user; } + + /** + * 根据登录手机号查询用户信息 + * @param phone 登录手机号 + * @return 用户对象 + */ + @Override + public User findByPhone(String phone){ + + if(StringUtils.isBlank(phone)){ + throw new ServiceException(CommonExceptionCodeEnum.PARAM_NOTVALID); + } + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MOBILE",phone); + + User user = this.usermybatisdao.selectOne(queryWrapper); + + if(null == user){ + return null; + } + + List departmentList = this.departmentMybatisDao.selectDeptByUserid(user.getId()); + user.formatDeptlist(departmentList); + user.setTenantList(this.userTenantService.listUserTenant(user.getId())); + + //返回用户前端菜单权限列表 + List frontmenuTList1 = isFrontmenuTService.queryUserMenuById(user.getLoginname()); + user.setFrontmenuTList(frontmenuTList1); + return user; + } + /** * 根据主键查询用户信息 * @param userid diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java index 02a58fbf..e0494324 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java @@ -101,6 +101,24 @@ public class UserTokenServiceImpl implements UserTokenService { User user = BeanUtil.copyProperties(userData,User.class); return user; } + + public User findByPhone(String phone) { + + cn.jyjz.xiaoyao.admin.dataobject.User userData = userService.findByPhone(phone); + + if(null == userData){ + return null; + } + Department department = this.departmentService.selectRootDepartid(userData.getDepartment()); + if(null != department){ + //userData.setDepartname(department.getDepartname()); + userData.setDepartmentRootId(department.getId()); + } + + User user = BeanUtil.copyProperties(userData,User.class); + return user; + } + public User findByUserid(Long userid) { cn.jyjz.xiaoyao.admin.dataobject.User userData = userService.findById(userid); -- 2.39.3