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<BsAssignMapper, BsAssig
 				List<String> strs = Arrays.asList(prodmark.split(","));
 				List<String> ids = new ArrayList<>();
 				for (String str : strs) {
+					if (StrUtil.isEmpty( str)) {
+						continue;
+					}
 					R<QualityGradeEntity> 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<QualityGradeEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("quality_grade",name);
 		List<QualityGradeEntity> 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());