From 3ae3b225cf2c4f6fa8c1fb3d33d0cf428e724514 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 18 Dec 2023 21:53:40 +0800
Subject: [PATCH] 添加性别

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index e557af3..e0a6058 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -757,21 +757,21 @@
 		return R.success("操作成功");
 	}
 
-//	/**
-//	 * 导出用户
-//	 */
-//	@GetMapping("export-user")
-//	@ApiOperationSupport(order = 13)
-//	@ApiOperation(value = "导出用户", notes = "传入user")
-//	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
+	/**
+	 * 导出用户
+	 */
+	@GetMapping("export-user")
+	@ApiOperationSupport(order = 13)
+	@ApiOperation(value = "导出用户", notes = "传入user")
+	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
 //		QueryWrapper<User> 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<UserExcel> list = userService.exportUser(queryWrapper);
-//		ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
-//	}
+		List<UserExcel> list = userService.exportUser(user);
+		ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
+	}
 
 
 	/**

--
Gitblit v1.9.3