diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java index e3418b94..e647df29 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -235,8 +235,12 @@ public class UserController { @ApiOperationSupport(order = 13) @ApiOperation(value = "导出用户", notes = "传入user") public void exportUser(@ApiIgnore @RequestParam Map user, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(user, UserExcel.class); - List list = userService.exportUser((!AuthUtil.isAdministrator()) ? queryWrapper.lambda().eq(UserExcel::getTenantId, bladeUser.getTenantId()) : queryWrapper); + QueryWrapper queryWrapper = Condition.getQueryWrapper(user, User.class); + if (!AuthUtil.isAdministrator()){ + queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()); + } + queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = userService.exportUser(queryWrapper); ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class); } diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java index 8fbbc1e4..30a83db2 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java @@ -58,6 +58,6 @@ public interface UserMapper extends BaseMapper { * @param queryWrapper * @return */ - List exportUser(@Param("ew") Wrapper queryWrapper); + List exportUser(@Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java index e268dc9c..2d0a160d 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java @@ -136,5 +136,5 @@ public interface IUserService extends BaseService { * @param queryWrapper * @return */ - List exportUser(Wrapper queryWrapper); + List exportUser(Wrapper queryWrapper); } diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index 0132b9cd..819cb131 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -211,7 +211,7 @@ public class UserServiceImpl extends BaseServiceImpl implement } @Override - public List exportUser(Wrapper queryWrapper) { + public List exportUser(Wrapper queryWrapper) { List userList = baseMapper.exportUser(queryWrapper); userList.forEach(user -> { user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));