导入查重合并功能，合并“工作任务”字段报错

tc-service/tap-task/src/main/java/com/minto/app/task/manager/TaskByTypeManagerImpl.java

@@ -15004,16 +15004,24 @@ public class TaskByTypeManagerImpl implements ITaskByTypeManager{
                 taskManager.saveOrUpdateAll(collect);
             }
         }
+        Map<String, Object> extendMap = new HashMap<>();
         Long contentTaskId = ReqUtil.getLong(request, "contentId");
         if(!titleTaskId.equals(contentTaskId)){
             //更新工作任务（content）
-            CommonContentBean sourceBean = contentManager.findCommonContentBeanById(contentTaskId);
-            CommonContentBean bean = contentManager.findCommonContentBeanById(titleTaskId);
-            bean.setContent(sourceBean == null ? "" : sourceBean.getContent());
-            contentManager.updateCommonContentBean(bean);
+            List<Map<String, Object>> extendDatas = taskListManager.findTemplateData4Task(contentTaskId, taskType, "task");
+            Map<String, Object> extendData =
+                    extendDatas.stream().filter(e->"content".equals(e.get("name"))).findFirst().orElse(new HashMap<>());
+            extendMap.put("content", extendData.get("realValue"));
+            TaskSummaryBean summary = taskSummaryDao.findTaskSummaryById(contentTaskId);
+            if(summary != null){
+                CommonContentBean sourceBean = contentManager.findCommonContentBeanById(summary.getContentId());
+                CommonContentBean bean = contentManager.findCommonContentBeanById(task.getContentId());
+                if(bean != null && sourceBean != null){
+                    bean.setContent(sourceBean.getContent());
+                    contentManager.updateCommonContentBean(bean);
+                }
+            }
         }
-
-        Map<String, Object> extendMap = new HashMap<>();
         Long directoryTaskId = ReqUtil.getLong(request, "directoryId");
         if(!titleTaskId.equals(directoryTaskId)){
             //更新任务分档（field_1000）