From 85bafa86f44fbe6646019fd8ecbab79f552ccd0a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 二月 2026 21:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java b/xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java
index 27b39ce..c904f9f 100644
--- a/xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java
+++ b/xp-service/xp-account/src/main/java/com/xiaopeng/account/service/impl/SysUserServiceImpl.java
@@ -9,7 +9,7 @@
import com.xiaopeng.account.mapper.SysUserMapper;
import com.xiaopeng.account.mapper.SysUserRoleMapper;
import com.xiaopeng.account.service.ISysUserService;
-import com.xiaopeng.account.vo.GetSysUserList;
+import com.xiaopeng.account.model.query.SysUserListQuery;
import com.xiaopeng.api.model.account.SysUser;
import com.xiaopeng.api.model.account.SysUserRole;
import org.slf4j.Logger;
@@ -19,8 +19,8 @@
import javax.annotation.Resource;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 用户 业务层处理
@@ -164,9 +164,7 @@
// insertUserPost(user);
// // 新增用户与角色管理
// insertUserRole(user);
- user.setCreateTime(new Date());
user.setCreateBy(tokenService.getLoginUser().getUsername());
- user.setUpdateTime(new Date());
user.setUpdateBy(tokenService.getLoginUser().getUsername());
return userMapper.insert(user);
}
@@ -248,15 +246,17 @@
@Transactional(rollbackFor = Exception.class)
public int deleteUserByIds(Long[] userIds) {
for (Long userId : userIds) {
- checkUserAllowed(new SysUser(userId));
+ SysUser sysUser = new SysUser();
+ sysUser.setId(userId);
+ checkUserAllowed(sysUser);
}
return userMapper.deleteUserByIds(userIds);
}
@Override
- public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList) {
- return null;
+ public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, SysUserListQuery sysUserListQuery) {
+ return userMapper.getList(pageInfo, sysUserListQuery);
}
}
--
Gitblit v1.7.1