From 80fe8c0debfa3eb252e4c066104eaf2f596de135 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 09 三月 2026 17:09:29 +0800
Subject: [PATCH] 【省立同德】处理patItem报错问题

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |    4 +++-
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java               |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
index e83d81d..2359194 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
@@ -661,7 +661,7 @@
     private Date continueTimeNow;
 
     @ApiModelProperty(value = "缁х画鍐呭")
-    private JSONObject continueContent;
+    private String continueContent;
 
     @ApiModelProperty(value = "缁х画娆℃暟")
     private Integer continueCount;
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 62c0bee..968c490 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -315,7 +315,9 @@
         List<ServiceSubtaskRes> serviceSubtaskResList = new ArrayList<>();
         for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
             ServiceSubtaskRes serviceSubtaskRes = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtaskRes.class);
-            serviceSubtaskRes.setContinueContent(JSONObject.parseObject(serviceSubtask.getContinueContent()));
+            if(ObjectUtils.isNotEmpty(serviceSubtask.getContinueContent())){
+                serviceSubtaskRes.setContinueContent(serviceSubtask.getContinueContent());
+            }
             serviceSubtaskResList.add(serviceSubtaskRes);
         }
         return serviceSubtaskResList;

--
Gitblit v1.9.3