From f69288eba36814cca01447f1033ecf22779ab9ba Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Thu, 25 Jun 2026 17:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/wms/controller/StGoodsExtController.java | 3 +-- .../java/org/springblade/wms/mapper/StGoodsExtMapper.java | 3 ++- .../springblade/wms/service/impl/StGoodsExtServiceImpl.java | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java index 5a67d24f4..cf51044aa 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java @@ -1,6 +1,5 @@ package org.springblade.wms.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; @@ -124,7 +123,7 @@ public class StGoodsExtController extends BladeController { @ApiLog("导出数据") @Operation(summary = "导出数据", description = "传入stGoodsExt") public void exportStGoodsExt(@Parameter(hidden = true) @RequestParam Map stGoodsExt, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(stGoodsExt, StGoodsExt.class); +// QueryWrapper queryWrapper = Condition.getQueryWrapper(stGoodsExt, StGoodsExt.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(StGoodsExt::getTenantId, bladeUser.getTenantId()); //} diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java index 22939ddc5..1d622cedd 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java @@ -9,6 +9,7 @@ import org.springblade.wms.pojo.entity.StGoodsExt; import org.springblade.wms.pojo.vo.StGoodsExtVO; import java.util.List; +import java.util.Map; /** * @version 1.0 @@ -47,6 +48,6 @@ public interface StGoodsExtMapper extends BaseMapper { Double getPlanQty(Long goodsId); - List exportStGoodsExt(@Param("stGoodsExt") StGoodsExtVO stGoodsExt); + List exportStGoodsExt(@Param("stGoodsExt") Map stGoodsExt); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java index 14413076c..ec29c4027 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsExtServiceImpl.java @@ -1,6 +1,5 @@ package org.springblade.wms.service.impl; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; @@ -129,8 +128,7 @@ public class StGoodsExtServiceImpl extends BaseServiceImpl exportStGoodsExt(Map stGoodsExt) { - StGoodsExtVO stGoodsExtVO = BeanUtil.mapToBean(stGoodsExt, StGoodsExtVO.class, true); - List stGoodsExtList = baseMapper.exportStGoodsExt(stGoodsExtVO); + List stGoodsExtList = baseMapper.exportStGoodsExt(stGoodsExt); return stGoodsExtList; }