From e483d76a3a23e00d0b1598139b2285617a922109 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 3 Dec 2024 15:00:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3004)=20-=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=89=B9=E6=AE=8A=E9=85=8D=E7=BD=AE=E5=BC=95?=
 =?UTF-8?q?=E8=B5=B7=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/GetFormInstanceAndPermissionCmd.java   |  4 +---
 .../impl/AggregateModelServiceImpl.java        | 16 +++++++++-------
 .../service/impl/FormModelServiceImpl.java     | 18 ++++++++++++++++--
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/GetFormInstanceAndPermissionCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/GetFormInstanceAndPermissionCmd.java
index 37c42bfff..7748bf24c 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/GetFormInstanceAndPermissionCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/GetFormInstanceAndPermissionCmd.java
@@ -156,7 +156,7 @@ public class GetFormInstanceAndPermissionCmd implements Command<FormInstanceInfo
         // 假设通过分享功能，分享了审批，那么被分享人不应该看到表单
         ExtAxProcessLog starterLog = logs.stream().filter(e -> Objects.equals(NODE_STARTER.getType(), e.getActivityId()))
                 .findFirst().orElse(new ExtAxProcessLog());
-        starterLog.getFormFieldPermissionConf().forEach(perm -> {
+        ListUtils.emptyIfNull(starterLog.getFormFieldPermissionConf()).forEach(perm -> {
             // 防预编程, 强制设置为 hidden
             perm.setRequired(false);
             perm.setEditable(false);
@@ -237,10 +237,8 @@ public class GetFormInstanceAndPermissionCmd implements Command<FormInstanceInfo
         FormRepositoryService formRepositoryService = formEngineConfiguration.getFormRepositoryService();
         FormDefinition formDefinition = formRepositoryService.createFormDefinitionQuery().deploymentId(relation.getFormDeploymentId()).singleResult();
 
-        FormService formService = formEngineConfiguration.getFormService();
         // 获取表单定义+字段内容
         return commandContext.getCommandExecutor().execute(new CustomGetFormInstanceModelCmd(null, null, formDefinition.getId(), taskId, processInstanceId, instance.getTenantId() ,null, false ));
-//        return formService.getFormInstanceModelById(formDefinition.getId(), taskId, processInstanceId, null, instance.getTenantId(), false);
     }
 
     private void preCheckParam() {
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/AggregateModelServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/AggregateModelServiceImpl.java
index ff4ed690f..caccee1c0 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/AggregateModelServiceImpl.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/AggregateModelServiceImpl.java
@@ -99,13 +99,15 @@ public class AggregateModelServiceImpl implements AggregateModelService {
         ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(definitionId).singleResult();
         String formDeploymentId = formModelService.deployFormModelById(formModel.getId(), tenantId, processDefinition.getDeploymentId());
 
-        // 保存关联关系
-        BpmnFormRelationCreateDTO relation = new BpmnFormRelationCreateDTO();
-        relation.setKey(model.getKey());
-        relation.setBpmnDefinitionId(definitionId);
-        relation.setFormDeploymentId(formDeploymentId);
-        relation.setTenantId(tenantId);
-        formRelationService.insert(relation);
+        if (StringUtils.hasText(formDeploymentId)) {
+            // 保存关联关系
+            BpmnFormRelationCreateDTO relation = new BpmnFormRelationCreateDTO();
+            relation.setKey(model.getKey());
+            relation.setBpmnDefinitionId(definitionId);
+            relation.setFormDeploymentId(formDeploymentId);
+            relation.setTenantId(tenantId);
+            formRelationService.insert(relation);
+        }
 
         return definitionId;
     }
diff --git a/workflow-engine-form/src/main/java/cn/axzo/workflow/form/service/impl/FormModelServiceImpl.java b/workflow-engine-form/src/main/java/cn/axzo/workflow/form/service/impl/FormModelServiceImpl.java
index 57e96418d..a66ff4d69 100644
--- a/workflow-engine-form/src/main/java/cn/axzo/workflow/form/service/impl/FormModelServiceImpl.java
+++ b/workflow-engine-form/src/main/java/cn/axzo/workflow/form/service/impl/FormModelServiceImpl.java
@@ -11,6 +11,7 @@ import cn.axzo.workflow.common.model.response.form.model.FormModelBaseVO;
 import cn.axzo.workflow.core.service.FormModelService;
 import cn.axzo.workflow.form.service.converter.FormModelConverter;
 import cn.hutool.json.JSONUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.ManagementService;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.repository.Model;
@@ -44,6 +45,7 @@ import static cn.axzo.workflow.common.util.BpmnNativeQueryUtil.sqlConnectors;
  * @author wangli
  * @since 2023/7/25 10:13
  */
+@Slf4j
 @Service
 public class FormModelServiceImpl implements FormModelService {
 
@@ -215,9 +217,21 @@ public class FormModelServiceImpl implements FormModelService {
         if (Objects.nonNull(tenantId) && !Objects.equals(model.getTenantId(), tenantId)) {
             throw new WorkflowEngineException(FORM_MODEL_NOT_EXISTS);
         }
+        byte[] modelEditorSource = repositoryService.getModelEditorSource(model.getId());
+        String modelStr;
+        if (StringUtils.hasText(modelStr = new String(modelEditorSource))) {
+            try {
+                FormDefinitionDTO formDefinitionDTO = JSON.parseObject(modelStr, FormDefinitionDTO.class);
+                if (Objects.isNull(formDefinitionDTO) || CollectionUtils.isEmpty(formDefinitionDTO.getFields())) {
+                    return null;
+                }
+            } catch (Exception e) {
+                log.warn("form model parse error: {}", e.getMessage(), e);
+                return null;
+            }
+        }
         FormDeployment deploy = formRepositoryService.createDeployment()
-                .addFormDefinition(model.getKey() + FORM_FILE_SUFFIX,
-                        new String(repositoryService.getModelEditorSource(model.getId())))
+                .addFormDefinition(model.getKey() + FORM_FILE_SUFFIX, modelStr)
                 .name(model.getName())
                 .category(model.getKey())
                 .tenantId(model.getTenantId())