From 99b8f8adef73d164def565984fb8370026b6e56a Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Tue, 2 Jun 2026 14:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CostCalculationEmployeeController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/CostCalculationEmployeeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/CostCalculationEmployeeController.java index 50641c473..17178d475 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/CostCalculationEmployeeController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/CostCalculationEmployeeController.java @@ -38,6 +38,7 @@ import lombok.AllArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; @@ -62,6 +63,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 成本计算物料配置表 控制器 @@ -196,9 +198,10 @@ public class CostCalculationEmployeeController extends BladeController { List list = new ArrayList<>(); for(CostCalculationEmployeeExcel employExcel : importList){ //根据作业中心查询，有则删除 - CostCalculationEmployeeEntity old = costCalculationEmployeeService.getOne(Wrappers.lambdaQuery().eq(CostCalculationEmployeeEntity::getWorkCenterName,employExcel.getWorkCenterName())); - if(old != null){ - costCalculationEmployeeService.deleteLogic(Func.toLongList(old.getId().toString())); + List oldList = costCalculationEmployeeService.list(Wrappers.lambdaQuery().eq(CostCalculationEmployeeEntity::getWorkCenterName,employExcel.getWorkCenterName())); + if(CollectionUtils.isNotEmpty(oldList)){ + List idList = oldList.stream().map(BaseEntity::getId).collect(Collectors.toList()); + costCalculationEmployeeService.deleteLogic(idList); } BsWorkCenterEntity workCenter = workCenterService.getOne(Wrappers.lambdaQuery().eq(BsWorkCenterEntity::getWcName,employExcel.getWorkCenterName())); if(workCenter == null){