From 2f49157c8bfaace21487669e21b4c352ec936dfa Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Wed, 18 Mar 2026 20:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DsTaskingServiceImpl.java    | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
index 613785d1..a245a490 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
@@ -202,15 +202,17 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 //				}
 
 				//查询子件信息
-				List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
-				//获取所有子件ID
-				List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
-				if (!CollectionUtils.isEmpty(idList)) {
-					List<DsPartVersionVO> dsPartEntityList = partService.selectDsPartVersionByIds(idList);
+				if(null != partEntity){
+					List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
+					//获取所有子件ID
+					List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
+					if (!CollectionUtils.isEmpty(idList)) {
+						List<DsPartVersionVO> dsPartEntityList = partService.selectDsPartVersionByIds(idList);
 //					for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) {
 //						dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName());
 //					}
-					dsTaskingVO.setChildren(dsPartEntityList);
+						dsTaskingVO.setChildren(dsPartEntityList);
+					}
 				}
 			}
 		}
@@ -520,17 +522,19 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 ////						dsTaskingVO.setChildren(list);
 ////					}
 //				}
-				List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
-				//获取所有子件ID
-				List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
-				if (!CollectionUtils.isEmpty(idList)) {
-					List<DsPartVersionVO> dsPartEntityList = partService.selectDsPartVersionByIds(idList);
-					for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) {
+				if(null != partEntity){
+					List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
+					//获取所有子件ID
+					List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
+					if (!CollectionUtils.isEmpty(idList)) {
+						List<DsPartVersionVO> dsPartEntityList = partService.selectDsPartVersionByIds(idList);
+						for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) {
 //						dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName());
-						DsPartVersionEntity partVersionEntity = partVersionService.selectByPartId(dsPartVersionVO.getId());
-						dsPartVersionVO.setPartVersion(partVersionEntity.getPartVersion());
+							DsPartVersionEntity partVersionEntity = partVersionService.selectByPartId(dsPartVersionVO.getId());
+							dsPartVersionVO.setPartVersion(partVersionEntity.getPartVersion());
+						}
+						dsTaskingVO.setChildren(dsPartEntityList);
 					}
-					dsTaskingVO.setChildren(dsPartEntityList);
 				}
 			}
 		}