From 4f7fd9e879d9de211b255eb21535a034893ffbff Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 五月 2026 16:20:48 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java
index a939cf7..34d9325 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java
@@ -69,7 +69,14 @@
return user;
}
- /**
+ @Override
+ public SysUser selectUserByPhone(String phone) {
+ SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhoneNumber, SensitiveDataCryptoUtil.encrypt(phone)).last("limit 1"));
+ decryptPhone(user);
+ return user;
+ }
+
+ /**
* 根据条件分页查询已分配用户角色列表
*
* @param user 用户信息
@@ -176,15 +183,7 @@
* @return 结果
*/
@Override
- @Transactional
- @ShardingSphereTransactionType(TransactionType.BASE)
public int insertUser(SysUser user) {
- // 新增用户信息
-// int rows = userMapper.insertUser(user);
-// // 新增用户岗位关联
-// insertUserPost(user);
-// // 新增用户与角色管理
-// insertUserRole(user);
user.setCreateBy(tokenService.getLoginUser().getUsername());
user.setUpdateBy(tokenService.getLoginUser().getUsername());
encryptPhone(user);
@@ -202,8 +201,6 @@
* @return 结果
*/
@Override
- @Transactional
- @ShardingSphereTransactionType(TransactionType.BASE)
public int updateUser(SysUser user) {
encryptPhone(user);
try {
@@ -300,9 +297,10 @@
@Override
public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, SysUserListQuery sysUserListQuery) {
- sysUserListQuery.setPhoneNumberQueryValues(SensitiveDataCryptoUtil.queryValues(sysUserListQuery.getPhoneNumber()));
+ if(StringUtils.isNotEmpty(sysUserListQuery.getPhoneNumber())){
+ sysUserListQuery.setPhoneNumberQueryValues(SensitiveDataCryptoUtil.queryValues(sysUserListQuery.getPhoneNumber()));
+ }
PageInfo<SysUser> page = userMapper.getList(pageInfo, sysUserListQuery);
- decryptPhones(page.getRecords());
return page;
}
--
Gitblit v1.7.1