From bb14a46e456ee3a89ae385559726667acd8af37e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 05 三月 2025 19:51:37 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index cb275c2..ec22b52 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -236,6 +236,8 @@
                         }
                     }
                 }
+            } else {
+                continue;
             }
             //灏嗚key鍜寁alue浠巖edis涓紝鍒犻櫎
             redisCache.deleteObject(key);
@@ -246,6 +248,8 @@
             serviceSubtask.setSendstate(6L);
             serviceSubtask.setExcep(serviceSubTaskAnswerReq.getExcep());
             serviceSubtask.setFinishtime(new Date());
+            serviceSubtask.setUpdateTime(new Date());
+            log.error("灏嗚key鍜寁alue浠巖edis涓�,serviceSubtask鐨勫�间负--------锛歿}", serviceSubtask);
             if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
             serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
         }
@@ -307,15 +311,17 @@
         if (flag == 0L) {
             tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam1(), pri_key));
             pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam2(), pri_key));
-            subId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam6(), pri_key));
+            //杩欎釜鏄湁闂鐨勶紝鍏堣繖鏍凤紝鍚堝苟浠g爜鐨勬椂鍊欐病鏈夋妸param6鍚堣繘鏉�
+            if (StringUtils.isNotEmpty(serviceSubTaskCacheReq.getParam6())) {
+                subId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam6(), pri_key));
+            }
         } else if (flag == 1L) {
             tid = Long.valueOf(serviceSubTaskCacheReq.getParam1());
             pid = Long.valueOf(serviceSubTaskCacheReq.getParam2());
             if (StringUtils.isNotEmpty(serviceSubTaskCacheReq.getParam6()))
                 subId = Long.valueOf(serviceSubTaskCacheReq.getParam6());
 
-        }
-        ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+        } ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
         serviceSubtaskVO.setTaskid(tid);
         serviceSubtaskVO.setPatid(pid);
         serviceSubtaskVO.setSubId(subId);
@@ -342,7 +348,7 @@
 
         Map<String, Object> scriptInfoByCondition = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom());
         if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
-            log.error("-----------scriptInfoByCondition鐨勫�间负锛歿}",scriptInfoByCondition);
+            log.error("-----------scriptInfoByCondition鐨勫�间负锛歿}", scriptInfoByCondition);
             if (scriptInfoByCondition.get("type").equals("1")) {
                 List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
                 for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {

--
Gitblit v1.9.3