From d18f7af65c3fe483ac7cfb9e9b59ad230dd7896e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Thu, 16 Apr 2026 15:14:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=B4=BE=E8=A7=84=E5=88=99=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/service/impl/BsAssignServiceImpl.java | 6 +++++- .../scheduling/scheduling/feign/WorkOrderClient.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java index 4c61e834..90e4e607 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java @@ -227,8 +227,12 @@ public class BsAssignServiceImpl extends BaseServiceImpl strs = Arrays.asList(prodmark.split(",")); List ids = new ArrayList<>(); for (String str : strs) { + if (StrUtil.isEmpty( str)) { + continue; + } R entity = iWorkOrderClient.getByName(str.trim()); - if (entity.getData() != null) { + if (cn.hutool.core.bean.BeanUtil.isNotEmpty(entity) && + cn.hutool.core.bean.BeanUtil.isNotEmpty(entity.getData()) && null != entity.getData().getId()) { ids.add(entity.getData().getId().toString()); } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java index 27067974..3df10b92 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java @@ -26,6 +26,7 @@ package org.springblade.scheduling.scheduling.feign; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.v3.oas.annotations.Hidden; import lombok.AllArgsConstructor; @@ -92,7 +93,7 @@ public class WorkOrderClient implements IWorkOrderClient { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("quality_grade",name); List list = qualityGradeService.list(queryWrapper); - if(null != list || list.size() > 0){ + if(CollUtil.isNotEmpty(list)){ return R.data(list.get(0)); } return R.data(new QualityGradeEntity());