功能修改-sjx

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<CostCalculationEmployeeEntity> list = new ArrayList<>();
 		for(CostCalculationEmployeeExcel employExcel : importList){
 			//根据作业中心查询，有则删除
-			CostCalculationEmployeeEntity old = costCalculationEmployeeService.getOne(Wrappers.<CostCalculationEmployeeEntity>lambdaQuery().eq(CostCalculationEmployeeEntity::getWorkCenterName,employExcel.getWorkCenterName()));
-			if(old != null){
-				costCalculationEmployeeService.deleteLogic(Func.toLongList(old.getId().toString()));
+			List<CostCalculationEmployeeEntity> oldList = costCalculationEmployeeService.list(Wrappers.<CostCalculationEmployeeEntity>lambdaQuery().eq(CostCalculationEmployeeEntity::getWorkCenterName,employExcel.getWorkCenterName()));
+			if(CollectionUtils.isNotEmpty(oldList)){
+				List<Long> idList = oldList.stream().map(BaseEntity::getId).collect(Collectors.toList());
+				costCalculationEmployeeService.deleteLogic(idList);
 			}
 			BsWorkCenterEntity workCenter = workCenterService.getOne(Wrappers.<BsWorkCenterEntity>lambdaQuery().eq(BsWorkCenterEntity::getWcName,employExcel.getWorkCenterName()));
 			if(workCenter == null){