🎉 用户导出去除已删除数据

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<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<UserExcel> queryWrapper = Condition.getQueryWrapper(user, UserExcel.class);
-		List<UserExcel> list = userService.exportUser((!AuthUtil.isAdministrator()) ? queryWrapper.lambda().eq(UserExcel::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+		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);
 	}
 

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -58,6 +58,6 @@ public interface UserMapper extends BaseMapper<User> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<UserExcel> exportUser(@Param("ew") Wrapper<UserExcel> queryWrapper);
+	List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
 
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -136,5 +136,5 @@ public interface IUserService extends BaseService<User> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<UserExcel> exportUser(Wrapper<UserExcel> queryWrapper);
+	List<UserExcel> exportUser(Wrapper<User> queryWrapper);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -211,7 +211,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	}
 
 	@Override
-	public List<UserExcel> exportUser(Wrapper<UserExcel> queryWrapper) {
+	public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
 		List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
 		userList.forEach(user -> {
 			user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));