From 11d763612e5dbcc5d2365683b8c8eb6c5b525653 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 18 十二月 2025 14:38:56 +0800
Subject: [PATCH] 【丽水】增加queryTaskByCondition空指针异常判断
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 4 ++++
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 3d86527..1ed8a77 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -184,6 +184,10 @@
List<ServiceSubtask> list = selectServiceSubtaskList(serviceSubtaskVO);
ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ if(ObjectUtils.isEmpty(serviceTask)){
+ log.error("鎵句笉鍒板搴旂殑serviceTask, orgid锛歿}, taskid: {}", serviceSubtask.getOrgid(), serviceSubtask.getTaskid());
+ return null;
+ }
if (CollectionUtils.isEmpty(list) || list.size() == 0) {
ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
ObjectMapper objectMapper = new ObjectMapper();
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index ea78762..30bdff6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -246,6 +246,9 @@
// }
//閫氳繃浠诲姟ID鑾峰彇妯℃澘ID
ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
+ if (serviceTask == null) {
+ throw new BaseException("浠诲姟涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎锛宼askid: " + taskid);
+ }
List info = new ArrayList();
if (serviceTask.getType().equals("1")) {
//闅忚
@@ -300,6 +303,9 @@
public Map<String, Object> getScriptByCondition(Long taskid, String zyserialnum, String mzserialnum, String tsserialnum) {
//閫氳繃浠诲姟ID鑾峰彇妯℃澘ID
ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
+ if (serviceTask == null) {
+ throw new BaseException("浠诲姟涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎锛宼askid: " + taskid);
+ }
//閫氳繃妯℃澘ID鑾峰彇闂淇℃伅
SvyTaskTemplateScript svyTaskTemplateScript = new SvyTaskTemplateScript();
svyTaskTemplateScript.setTemplateID(Long.valueOf(serviceTask.getTemplateid()));
--
Gitblit v1.9.3