Преглед изворни кода

fix: 批量任务审批-查询任务类型树NPE异常

lixuesong пре 3 година
родитељ
комит
519dbeb17a

+ 7 - 5
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDeptTaskTypeConfigServiceImpl.java

@@ -282,11 +282,13 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 			// 上级企业配置
 			WmDeptTaskTypeConfig ancestorDeptTaskTypeConfig = this.getOne(Wrappers.<WmDeptTaskTypeConfig>lambdaQuery()
 					.eq(WmDeptTaskTypeConfig::getDeptId, ancestorDeptRelation.getAncestor()));
-			List<WmDeptTaskTypeConfigJsonDTO> ancestorConfigJsonDTOList = JSON.parseArray(ancestorDeptTaskTypeConfig.getTaskTypeJson(), WmDeptTaskTypeConfigJsonDTO.class);
-			ancestorConfigTaskTypeIdList = ancestorConfigJsonDTOList.stream()
-					.filter(configJsonDTO -> configJsonDTO.getQualifiedTask() && configJsonDTO.getAssociateLower())
-					.map(WmDeptTaskTypeConfigJsonDTO::getTaskTypeName)
-					.collect(Collectors.toList());
+			if (ancestorDeptTaskTypeConfig != null) {
+				List<WmDeptTaskTypeConfigJsonDTO> ancestorConfigJsonDTOList = JSON.parseArray(ancestorDeptTaskTypeConfig.getTaskTypeJson(), WmDeptTaskTypeConfigJsonDTO.class);
+				ancestorConfigTaskTypeIdList = ancestorConfigJsonDTOList.stream()
+						.filter(configJsonDTO -> configJsonDTO.getQualifiedTask() && configJsonDTO.getAssociateLower())
+						.map(WmDeptTaskTypeConfigJsonDTO::getTaskTypeName)
+						.collect(Collectors.toList());
+			}
 		}
 		if (CollectionUtil.isEmpty(configTaskTypeIdList) && CollectionUtil.isEmpty(ancestorConfigTaskTypeIdList)) {
 			return new ArrayList<>();