ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-09 20:57:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: continew-starter 2.2.0 => 2.3.0

Browse Source
This commit is contained in:
Charles7c
2024-07-18 23:56:20 +08:00
parent 81de8d060b
commit eb8fe92088
5 changed files with 21 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
View File

@@ -115,7 +115,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
public PageResp<UserResp> page(UserQuery query, PageQuery pageQuery) {
QueryWrapper<UserDO> queryWrapper = this.buildQueryWrapper(query);
IPage<UserDetailResp> page = baseMapper.selectUserPage(pageQuery.toPage(), queryWrapper);
PageResp<UserResp> pageResp = PageResp.build(page, this.listClass);
PageResp<UserResp> pageResp = PageResp.build(page, super.getListClass());
pageResp.getList().forEach(this::fill);
return pageResp;
}
@@ -462,7 +462,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
// 设置排序
super.sort(queryWrapper, sortQuery);
List<UserDetailResp> entityList = baseMapper.selectUserList(queryWrapper);
if (entityClass == targetClass) {
if (this.getEntityClass() == targetClass) {
return (List<E>)entityList;
}
return BeanUtil.copyToList(entityList, targetClass);