From 94462d19bb33abe9654781d791ae0163a3e0e37e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 27 一月 2026 16:29:07 +0800
Subject: [PATCH] 【丽水】微信已发送、已领取视为发送成功,不再进行补偿 改为 当前发送方式为微信的,且下一发送方式为短信的,微信发送状态为已发送、已领取的,跳过短信步骤

---
 smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

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