暂存

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -202,6 +202,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 //				}
 
 				//查询子件信息
+				if(null != partEntity){
 					List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
 					//获取所有子件ID
 					List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
@@ -214,6 +215,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 					}
 				}
 			}
+		}
 
 		return page.setRecords(dsTaskingVOS);
 	}
@@ -520,6 +522,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 ////						dsTaskingVO.setChildren(list);
 ////					}
 //				}
+				if(null != partEntity){
 					List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
 					//获取所有子件ID
 					List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
@@ -534,6 +537,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 					}
 				}
 			}
+		}
 
 		return  page.setRecords(dsTaskingList);
 	}