租户初始化新增form初始化，调整角色

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/bpm/FormApi.java

@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.framework.common.biz.bpm;
+
+
+import cn.iocoder.yudao.framework.common.biz.bpm.dto.FormSaveDTO;
+
+public interface FormApi {
+
+    Long initForm(FormSaveDTO dto);
+
+}

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/bpm/dto/FormSaveDTO.java

@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.framework.common.biz.bpm.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 动态表单创建/更新 Request VO")
+@Data
+public class FormSaveDTO {
+
+    @Schema(description = "表单编号", example = "1024")
+    private Long id;
+
+    @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @NotNull(message = "表单名称不能为空")
+    private String name;
+
+    @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "表单的配置不能为空")
+    private String conf;
+
+    @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "表单项的数组不能为空")
+    private List<String> fields;
+
+    @Schema(description = "表单状态-参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "表单状态不能为空")
+    private Integer status;
+
+    @Schema(description = "备注", example = "我是备注")
+    private String remark;
+}

yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/task/FormApiImpl.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.bpm.api.task;
+
+import cn.iocoder.yudao.framework.common.biz.bpm.FormApi;
+import cn.iocoder.yudao.framework.common.biz.bpm.dto.FormSaveDTO;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormSaveReqVO;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+@Service
+@Validated
+public class FormApiImpl implements FormApi {
+
+    @Autowired
+    private BpmFormService bpmFormService;
+
+    @Override
+    public Long initForm(FormSaveDTO dto) {
+        BpmFormSaveReqVO vo = BeanUtils.toBean(dto, BpmFormSaveReqVO.class);
+        Long id = bpmFormService.createForm(vo);
+        return id;
+    }
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/api/task/IscsInitApiImpl.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.iscs.api.task;
 
+import cn.iocoder.yudao.framework.common.biz.bpm.FormApi;
+import cn.iocoder.yudao.framework.common.biz.bpm.dto.FormSaveDTO;
 import cn.iocoder.yudao.framework.common.biz.iscs.IscsInitApi;
 import cn.iocoder.yudao.framework.common.biz.iscs.dto.InitWorkDTO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowdesign.vo.WorkflowDesignSaveReqVO;
@@ -9,6 +11,7 @@ import cn.iocoder.yudao.module.iscs.service.isolationpoint.IsolationPointService
 import cn.iocoder.yudao.module.iscs.service.workdesign.WorkflowDesignService;
 import cn.iocoder.yudao.module.iscs.service.workdesign.WorkflowWorkService;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -32,6 +35,8 @@ public class IscsInitApiImpl implements IscsInitApi {
     private WorkflowDesignService workflowDesignService;
     @Resource
     private WorkflowWorkService workflowWorkService;
+   @Resource
+   private FormApi formApi;
 
 
     @Override
@@ -64,10 +69,26 @@ public class IscsInitApiImpl implements IscsInitApi {
         isolationPoints.add(isolationPointDO2.getId());
         isolationPoints.add(isolationPointDO3.getId());
 
+        // form 表单初始化
+        FormSaveDTO formSaveDTO = new FormSaveDTO();
+        formSaveDTO.setName("审核操作单");
+        formSaveDTO.setConf(getValue(1));
+        formSaveDTO.setFields(jsonToList(getValue(3)));
+        formSaveDTO.setStatus(0);
+        Long formId1 = formApi.initForm(formSaveDTO);
+
+        FormSaveDTO formSaveDTO2 = new FormSaveDTO();
+        formSaveDTO2.setName("现场勘察确认单");
+        formSaveDTO2.setConf(getValue(2));
+        formSaveDTO2.setFields(jsonToList(getValue(4)));
+        formSaveDTO2.setStatus(0);
+        Long formId2 = formApi.initForm(formSaveDTO2);
+
+
         // 流程模板初始化
         WorkflowDesignSaveReqVO workflowDesignSaveReqVO = new WorkflowDesignSaveReqVO();
         workflowDesignSaveReqVO.setName("作业流程实例");
-        workflowDesignSaveReqVO.setContent(getInitJson(isolationPoints, lockPerson, coLockPersons, workerUserId));
+        workflowDesignSaveReqVO.setContent(getInitJson(isolationPoints, lockPerson, coLockPersons, workerUserId, formId1, formId2));
         workflowDesignSaveReqVO.setDescription("初始化作业模板");
         Long workflowDesign = workflowDesignService.createWorkflowDesign(workflowDesignSaveReqVO);
 
@@ -81,315 +102,400 @@ public class IscsInitApiImpl implements IscsInitApi {
 
     }
 
+    private static String getValue(Integer i) {
+
+        String conf1 = "{\"formConfig\":{\"name\":\"审核操作单1\",\"labelPosition\":\"right\",\"formSize\":\"default\",\"labelSuffix\":\"\",\"labelWidth\":120,\"hideRequiredMark\":false,\"showValidationError\":true,\"inlineValidation\":false,\"showSubmitButton\":true,\"showResetButton\":false,\"layoutColumns\":2,\"useCardLayout\":true}}";
+        String conf2 = "{\"formConfig\":{\"name\":\"现场勘察确认单2025\",\"labelPosition\":\"right\",\"formSize\":\"default\",\"labelSuffix\":\"\",\"labelWidth\":150,\"hideRequiredMark\":false,\"showValidationError\":true,\"inlineValidation\":false,\"showSubmitButton\":true,\"showResetButton\":false,\"layoutColumns\":2,\"useCardLayout\":true},\"form\":{\"inline\":false,\"hideRequiredAsterisk\":false,\"labelPosition\":\"right\",\"size\":\"default\",\"labelWidth\":\"100px\"},\"resetBtn\":{\"show\":false,\"innerText\":\"重置\"},\"submitBtn\":{\"show\":true,\"innerText\":\"提交\"}}";
+        String fields1 = "[\"{\\\"id\\\":\\\"field_1766714167575\\\",\\\"type\\\":\\\"radio\\\",\\\"label\\\":\\\"同意作业\\\",\\\"name\\\":\\\"field1766714167575\\\",\\\"required\\\":true,\\\"placeholder\\\":\\\"\\\",\\\"options\\\":[{\\\"label\\\":\\\"是\\\",\\\"value\\\":\\\"option1\\\"},{\\\"label\\\":\\\"否\\\",\\\"value\\\":\\\"option2\\\"}],\\\"requiredMessage\\\":\\\"请选择\\\"}\",\"{\\\"id\\\":\\\"field_1766714231112\\\",\\\"type\\\":\\\"radio\\\",\\\"label\\\":\\\"宣传到位\\\",\\\"name\\\":\\\"field1766714231112\\\",\\\"required\\\":true,\\\"placeholder\\\":\\\"\\\",\\\"options\\\":[{\\\"label\\\":\\\"是\\\",\\\"value\\\":\\\"option1\\\"},{\\\"label\\\":\\\"否\\\",\\\"value\\\":\\\"option2\\\"}],\\\"requiredMessage\\\":\\\"请选择\\\"}\",\"{\\\"id\\\":\\\"field_1766712854818\\\",\\\"type\\\":\\\"radio\\\",\\\"label\\\":\\\"物料完整\\\",\\\"name\\\":\\\"field1766712854818\\\",\\\"required\\\":true,\\\"placeholder\\\":\\\"\\\",\\\"options\\\":[{\\\"label\\\":\\\"是\\\",\\\"value\\\":\\\"option1\\\"},{\\\"label\\\":\\\"否\\\",\\\"value\\\":\\\"option2\\\"}],\\\"labelWidth\\\":180,\\\"requiredMessage\\\":\\\"请选择\\\"}\",\"{\\\"id\\\":\\\"field_1766712904289\\\",\\\"type\\\":\\\"textarea\\\",\\\"label\\\":\\\"审核意见\\\",\\\"name\\\":\\\"field1766712904289\\\",\\\"required\\\":false,\\\"placeholder\\\":\\\"请输入内容\\\",\\\"options\\\":[]}\"]";
+        String fields2 = "[\"{\\\"id\\\":\\\"field_1766712500367\\\",\\\"type\\\":\\\"input\\\",\\\"label\\\":\\\"作业区域\\\",\\\"name\\\":\\\"field1766712500367\\\",\\\"required\\\":true,\\\"placeholder\\\":\\\"请输入作业区域\\\",\\\"requiredMessage\\\":\\\"作业区域不能为空\\\",\\\"_fc_id\\\":\\\"id_Fpb1mk3gfevpabc\\\",\\\"field\\\":\\\"Fso4mk3gfevpacc\\\",\\\"display\\\":true,\\\"hidden\\\":false,\\\"_fc_drag_tag\\\":\\\"input\\\"}\",\"{\\\"id\\\":\\\"field_1766712545791\\\",\\\"type\\\":\\\"daterange\\\",\\\"label\\\":\\\"计划作业时间\\\",\\\"name\\\":\\\"field1766712545791\\\",\\\"required\\\":true,\\\"placeholder\\\":[\\\"开始日期\\\",\\\"结束日期\\\"],\\\"requiredMessage\\\":\\\"计划时间不能为空\\\",\\\"_fc_id\\\":\\\"id_Fddhmk3gfevpadc\\\",\\\"display\\\":true,\\\"hidden\\\":false}\",\"{\\\"id\\\":\\\"field_1766712854818\\\",\\\"type\\\":\\\"radio\\\",\\\"label\\\":\\\"工具已准备就位\\\",\\\"name\\\":\\\"field1766712854818\\\",\\\"required\\\":true,\\\"placeholder\\\":\\\"\\\",\\\"options\\\":[{\\\"label\\\":\\\"是\\\",\\\"value\\\":\\\"option1\\\"},{\\\"label\\\":\\\"否\\\",\\\"value\\\":\\\"option2\\\"}],\\\"requiredMessage\\\":\\\"请选择\\\",\\\"_fc_id\\\":\\\"id_Fjj3mk3gfevpaec\\\",\\\"field\\\":\\\"Fba8mk3gfevpafc\\\",\\\"display\\\":true,\\\"hidden\\\":false,\\\"_fc_drag_tag\\\":\\\"radio\\\"}\",\"{\\\"id\\\":\\\"field_1766713378577\\\",\\\"type\\\":\\\"radio\\\",\\\"label\\\":\\\"任务已明确\\\",\\\"name\\\":\\\"field1766713378577\\\",\\\"required\\\":false,\\\"placeholder\\\":\\\"\\\",\\\"options\\\":[{\\\"label\\\":\\\"是\\\",\\\"value\\\":\\\"option1\\\"},{\\\"label\\\":\\\"否\\\",\\\"value\\\":\\\"option2\\\"}],\\\"_fc_id\\\":\\\"id_F08omk3gfevpagc\\\",\\\"field\\\":\\\"Fkrimk3gfevpahc\\\",\\\"display\\\":true,\\\"hidden\\\":false,\\\"_fc_drag_tag\\\":\\\"radio\\\"}\"]";
+        if (i == 1) {
+            return conf1;
+        } else if (i == 2) {
+            return conf2;
+        } else if (i == 3) {
+            return fields1;
+        } else if (i == 4) {
+            return fields2;
+        }
+        return null;
+    }
+
+    private List<String> jsonToList(String jsonArrayStr) {
+        try {
+            // 创建ObjectMapper对象（Jackson核心工具）
+            ObjectMapper objectMapper = new ObjectMapper();
+            // 解析JSON数组为List<String>
+            List<String> jsonList = objectMapper.readValue(
+                    jsonArrayStr,
+                    new TypeReference<>() {
+                    } // 指定泛型类型
+            );
+
+            // 验证结果
+            System.out.println("解析后：" + jsonList);
+            return jsonList;
+        } catch (Exception e) {
+            e.printStackTrace(); // 捕获解析异常（如JSON格式错误）
+        }
+        return null;
+    }
+
 
-    private static String getInitJson(List<Long> isolationPoints, Long lockPerson, List<Long> coLockPersons, Long workerUserId) {
+    private static String getInitJson(List<Long> isolationPoints, Long lockPerson, List<Long> coLockPersons, Long workerUserId, Long formId1, Long formId2) {
         String originalJsonStr = "{\n" +
-                "  \"nodeCount\" : 6,\n" +
-                "  \"edgeCount\" : 5,\n" +
-                "  \"adjacency\" : {\n" +
-                "    \"createJob-1766650792290\" : {\n" +
-                "      \"parentUuid\" : [ ],\n" +
-                "      \"childrenUuid\" : [ \"review-1766650839450\" ]\n" +
+                "  \"nodeCount\": 6,\n" +
+                "  \"edgeCount\": 5,\n" +
+                "  \"adjacency\": {\n" +
+                "    \"createJob-1766650792290\": {\n" +
+                "      \"parentUuid\": [],\n" +
+                "      \"childrenUuid\": [\n" +
+                "        \"review-1766650839450\"\n" +
+                "      ]\n" +
                 "    },\n" +
-                "    \"confirm-1766650799337\" : {\n" +
-                "      \"parentUuid\" : [ \"review-1766650839450\" ],\n" +
-                "      \"childrenUuid\" : [ \"isolation-1766650858056\" ]\n" +
+                "    \"confirm-1766650799337\": {\n" +
+                "      \"parentUuid\": [\n" +
+                "        \"review-1766650839450\"\n" +
+                "      ],\n" +
+                "      \"childrenUuid\": [\n" +
+                "        \"isolation-1766650858056\"\n" +
+                "      ]\n" +
                 "    },\n" +
-                "    \"review-1766650839450\" : {\n" +
-                "      \"parentUuid\" : [ \"createJob-1766650792290\" ],\n" +
-                "      \"childrenUuid\" : [ \"confirm-1766650799337\" ]\n" +
+                "    \"review-1766650839450\": {\n" +
+                "      \"parentUuid\": [\n" +
+                "        \"createJob-1766650792290\"\n" +
+                "      ],\n" +
+                "      \"childrenUuid\": [\n" +
+                "        \"confirm-1766650799337\"\n" +
+                "      ]\n" +
                 "    },\n" +
-                "    \"isolation-1766650858056\" : {\n" +
-                "      \"parentUuid\" : [ \"confirm-1766650799337\" ],\n" +
-                "      \"childrenUuid\" : [ \"releaseIsolation-1766650866562\" ]\n" +
+                "    \"isolation-1766650858056\": {\n" +
+                "      \"parentUuid\": [\n" +
+                "        \"confirm-1766650799337\"\n" +
+                "      ],\n" +
+                "      \"childrenUuid\": [\n" +
+                "        \"releaseIsolation-1766650866562\"\n" +
+                "      ]\n" +
                 "    },\n" +
-                "    \"releaseIsolation-1766650866562\" : {\n" +
-                "      \"parentUuid\" : [ \"isolation-1766650858056\" ],\n" +
-                "      \"childrenUuid\" : [ \"complete-1766650878643\" ]\n" +
+                "    \"releaseIsolation-1766650866562\": {\n" +
+                "      \"parentUuid\": [\n" +
+                "        \"isolation-1766650858056\"\n" +
+                "      ],\n" +
+                "      \"childrenUuid\": [\n" +
+                "        \"complete-1766650878643\"\n" +
+                "      ]\n" +
                 "    },\n" +
-                "    \"complete-1766650878643\" : {\n" +
-                "      \"parentUuid\" : [ \"releaseIsolation-1766650866562\" ],\n" +
-                "      \"childrenUuid\" : [ ]\n" +
+                "    \"complete-1766650878643\": {\n" +
+                "      \"parentUuid\": [\n" +
+                "        \"releaseIsolation-1766650866562\"\n" +
+                "      ],\n" +
+                "      \"childrenUuid\": []\n" +
                 "    }\n" +
                 "  },\n" +
-                "  \"nodes\" : [ {\n" +
-                "    \"uuid\" : \"createJob-1766650792290\",\n" +
-                "    \"type\" : \"createJob\",\n" +
-                "    \"position\" : {\n" +
-                "      \"x\" : 22.01707056367252,\n" +
-                "      \"y\" : 50.73719707724561\n" +
+                "  \"nodes\": [\n" +
+                "    {\n" +
+                "      \"uuid\": \"createJob-1766650792290\",\n" +
+                "      \"type\": \"createJob\",\n" +
+                "      \"position\": {\n" +
+                "        \"x\": 22.01707056367252,\n" +
+                "        \"y\": 50.73719707724561\n" +
+                "      },\n" +
+                "      \"nodeName\": \"创建作业\",\n" +
+                "      \"nodeIcon\": \"2007.png\",\n" +
+                "      \"smsTemplateCode\": \"true\",\n" +
+                "      \"messageTemplateCode\": \"true\",\n" +
+                "      \"emailTemplateCode\": \"false\",\n" +
+                "      \"appTemplateCode\": \"true\",\n" +
+                "      \"data\": {\n" +
+                "        \"label\": \"创建作业\",\n" +
+                "        \"type\": \"createJob\",\n" +
+                "        \"nodeId\": \"001\",\n" +
+                "        \"icon\": \"2007.png\",\n" +
+                "        \"workerUserId\": \"\",\n" +
+                "        \"remark\": \"\",\n" +
+                "        \"formId\": \"\",\n" +
+                "        \"isolationType\": \"\",\n" +
+                "        \"isolationPoints\": [],\n" +
+                "        \"isolationNode\": [],\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
+                "        \"lockPerson\": \"\",\n" +
+                "        \"coLockPersons\": [],\n" +
+                "        \"notificationMethods\": {\n" +
+                "          \"sms\": true,\n" +
+                "          \"message\": true,\n" +
+                "          \"email\": false,\n" +
+                "          \"app\": true\n" +
+                "        },\n" +
+                "        \"notificationPerson\": \"\",\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"创建作业\",\n" +
+                "        \"nodeIcon\": \"2007.png\"\n" +
+                "      }\n" +
                 "    },\n" +
-                "    \"nodeName\" : \"创建作业\",\n" +
-                "    \"nodeIcon\" : \"2007.png\",\n" +
-                "    \"smsTemplateCode\" : \"false\",\n" +
-                "    \"messageTemplateCode\" : \"false\",\n" +
-                "    \"emailTemplateCode\" : \"false\",\n" +
-                "    \"appTemplateCode\" : \"false\",\n" +
-                "    \"data\" : {\n" +
-                "      \"label\" : \"创建作业\",\n" +
-                "      \"type\" : \"createJob\",\n" +
-                "      \"nodeId\" : \"001\",\n" +
-                "      \"icon\" : \"2007.png\",\n" +
-                "      \"workerUserId\" : 251,\n" +
-                "      \"remark\" : \"\",\n" +
-                "      \"formId\" : \"\",\n" +
-                "      \"isolationType\" : \"\",\n" +
-                "      \"isolationPoints\" : [ ],\n" +
-                "      \"isolationNode\" : [ ],\n" +
-                "      \"isolationNodeUuid\" : \"\",\n" +
-                "      \"lockPerson\" : \"\",\n" +
-                "      \"coLockPersons\" : [ ],\n" +
-                "      \"notificationMethods\" : {\n" +
-                "        \"sms\" : false,\n" +
-                "        \"message\" : false,\n" +
-                "        \"email\" : false,\n" +
-                "        \"app\" : false\n" +
+                "    {\n" +
+                "      \"uuid\": \"confirm-1766650799337\",\n" +
+                "      \"type\": \"confirm\",\n" +
+                "      \"position\": {\n" +
+                "        \"x\": 361.5712963285811,\n" +
+                "        \"y\": 50.23975081223905\n" +
                 "      },\n" +
-                "      \"notificationPerson\" : \"\",\n" +
-                "      \"notificationTime\" : \"\",\n" +
-                "      \"selectedIsolationNodeId\" : \"\",\n" +
-                "      \"submitForm\" : \"\",\n" +
-                "      \"nodeName\" : \"创建作业\",\n" +
-                "      \"nodeIcon\" : \"2007.png\"\n" +
-                "    }\n" +
-                "  }, {\n" +
-                "    \"uuid\" : \"confirm-1766650799337\",\n" +
-                "    \"type\" : \"confirm\",\n" +
-                "    \"position\" : {\n" +
-                "      \"x\" : 351.78708474285037,\n" +
-                "      \"y\" : 24.381477335664925\n" +
+                "      \"nodeName\": \"现场勘察确认\",\n" +
+                "      \"nodeIcon\": \"4005.png\",\n" +
+                "      \"smsTemplateCode\": \"true\",\n" +
+                "      \"messageTemplateCode\": \"true\",\n" +
+                "      \"emailTemplateCode\": \"false\",\n" +
+                "      \"appTemplateCode\": \"true\",\n" +
+                "      \"data\": {\n" +
+                "        \"label\": \"现场勘察确认\",\n" +
+                "        \"type\": \"confirm\",\n" +
+                "        \"nodeId\": \"002\",\n" +
+                "        \"icon\": \"4005.png\",\n" +
+                "        \"workerUserId\": \"180\",\n" +
+                "        \"remark\": \"\",\n" +
+                "        \"formId\": \"61\",\n" +
+                "        \"isolationType\": \"\",\n" +
+                "        \"isolationPoints\": [],\n" +
+                "        \"isolationNode\": [],\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
+                "        \"lockPerson\": \"\",\n" +
+                "        \"coLockPersons\": [],\n" +
+                "        \"notificationMethods\": {\n" +
+                "          \"sms\": true,\n" +
+                "          \"message\": true,\n" +
+                "          \"email\": false,\n" +
+                "          \"app\": true\n" +
+                "        },\n" +
+                "        \"notificationPerson\": \"\",\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"现场勘察确认\",\n" +
+                "        \"nodeIcon\": \"4005.png\"\n" +
+                "      }\n" +
                 "    },\n" +
-                "    \"nodeName\" : \"现场勘察确认\",\n" +
-                "    \"nodeIcon\" : \"4005.png\",\n" +
-                "    \"smsTemplateCode\" : \"false\",\n" +
-                "    \"messageTemplateCode\" : \"false\",\n" +
-                "    \"emailTemplateCode\" : \"false\",\n" +
-                "    \"appTemplateCode\" : \"false\",\n" +
-                "    \"data\" : {\n" +
-                "      \"label\" : \"现场勘察确认\",\n" +
-                "      \"type\" : \"confirm\",\n" +
-                "      \"nodeId\" : \"002\",\n" +
-                "      \"icon\" : \"4005.png\",\n" +
-                "      \"workerUserId\" : 251,\n" +
-                "      \"remark\" : \"\",\n" +
-                "      \"formId\" : \"53\",\n" +
-                "      \"isolationType\" : \"\",\n" +
-                "      \"isolationPoints\" : [ ],\n" +
-                "      \"isolationNode\" : [ ],\n" +
-                "      \"isolationNodeUuid\" : \"\",\n" +
-                "      \"lockPerson\" : \"\",\n" +
-                "      \"coLockPersons\" : [ ],\n" +
-                "      \"notificationMethods\" : {\n" +
-                "        \"sms\" : false,\n" +
-                "        \"message\" : false,\n" +
-                "        \"email\" : false,\n" +
-                "        \"app\" : false\n" +
+                "    {\n" +
+                "      \"uuid\": \"review-1766650839450\",\n" +
+                "      \"type\": \"review\",\n" +
+                "      \"position\": {\n" +
+                "        \"x\": 189.9974210811705,\n" +
+                "        \"y\": 50.68595889912385\n" +
                 "      },\n" +
-                "      \"notificationPerson\" : \"\",\n" +
-                "      \"notificationTime\" : \"\",\n" +
-                "      \"selectedIsolationNodeId\" : \"\",\n" +
-                "      \"submitForm\" : \"\",\n" +
-                "      \"nodeName\" : \"现场勘察确认\",\n" +
-                "      \"nodeIcon\" : \"4005.png\"\n" +
-                "    }\n" +
-                "  }, {\n" +
-                "    \"uuid\" : \"review-1766650839450\",\n" +
-                "    \"type\" : \"review\",\n" +
-                "    \"position\" : {\n" +
-                "      \"x\" : 189.9974210811705,\n" +
-                "      \"y\" : 50.68595889912385\n" +
+                "      \"nodeName\": \"作业审核\",\n" +
+                "      \"nodeIcon\": \"1004.png\",\n" +
+                "      \"smsTemplateCode\": \"true\",\n" +
+                "      \"messageTemplateCode\": \"true\",\n" +
+                "      \"emailTemplateCode\": \"false\",\n" +
+                "      \"appTemplateCode\": \"true\",\n" +
+                "      \"data\": {\n" +
+                "        \"label\": \"作业审核\",\n" +
+                "        \"type\": \"review\",\n" +
+                "        \"nodeId\": \"003\",\n" +
+                "        \"icon\": \"1004.png\",\n" +
+                "        \"workerUserId\": \"178\",\n" +
+                "        \"remark\": \"\",\n" +
+                "        \"formId\": \"60\",\n" +
+                "        \"isolationType\": \"\",\n" +
+                "        \"isolationPoints\": [],\n" +
+                "        \"isolationNode\": [],\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
+                "        \"lockPerson\": \"\",\n" +
+                "        \"coLockPersons\": [],\n" +
+                "        \"notificationMethods\": {\n" +
+                "          \"sms\": true,\n" +
+                "          \"message\": true,\n" +
+                "          \"email\": false,\n" +
+                "          \"app\": true\n" +
+                "        },\n" +
+                "        \"notificationPerson\": \"\",\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"作业审核\",\n" +
+                "        \"nodeIcon\": \"1004.png\"\n" +
+                "      }\n" +
                 "    },\n" +
-                "    \"nodeName\" : \"作业审核\",\n" +
-                "    \"nodeIcon\" : \"1004.png\",\n" +
-                "    \"smsTemplateCode\" : \"false\",\n" +
-                "    \"messageTemplateCode\" : \"false\",\n" +
-                "    \"emailTemplateCode\" : \"false\",\n" +
-                "    \"appTemplateCode\" : \"false\",\n" +
-                "    \"data\" : {\n" +
-                "      \"label\" : \"作业审核\",\n" +
-                "      \"type\" : \"review\",\n" +
-                "      \"nodeId\" : \"003\",\n" +
-                "      \"icon\" : \"1004.png\",\n" +
-                "      \"workerUserId\" : 251,\n" +
-                "      \"remark\" : \"\",\n" +
-                "      \"formId\" : \"54\",\n" +
-                "      \"isolationType\" : \"\",\n" +
-                "      \"isolationPoints\" : [ ],\n" +
-                "      \"isolationNode\" : [ ],\n" +
-                "      \"isolationNodeUuid\" : \"\",\n" +
-                "      \"lockPerson\" : \"\",\n" +
-                "      \"coLockPersons\" : [ ],\n" +
-                "      \"notificationMethods\" : {\n" +
-                "        \"sms\" : false,\n" +
-                "        \"message\" : false,\n" +
-                "        \"email\" : false,\n" +
-                "        \"app\" : false\n" +
+                "    {\n" +
+                "      \"uuid\": \"isolation-1766650858056\",\n" +
+                "      \"type\": \"isolation\",\n" +
+                "      \"position\": {\n" +
+                "        \"x\": 561.3990364559648,\n" +
+                "        \"y\": 51.367615523177534\n" +
                 "      },\n" +
-                "      \"notificationPerson\" : \"\",\n" +
-                "      \"notificationTime\" : \"\",\n" +
-                "      \"selectedIsolationNodeId\" : \"\",\n" +
-                "      \"submitForm\" : \"\",\n" +
-                "      \"nodeName\" : \"作业审核\",\n" +
-                "      \"nodeIcon\" : \"1004.png\"\n" +
-                "    }\n" +
-                "  }, {\n" +
-                "    \"uuid\" : \"isolation-1766650858056\",\n" +
-                "    \"type\" : \"isolation\",\n" +
-                "    \"position\" : {\n" +
-                "      \"x\" : 562.101351432562,\n" +
-                "      \"y\" : 51.367615523177534\n" +
+                "      \"nodeName\": \"能量隔离\",\n" +
+                "      \"nodeIcon\": \"6005.png\",\n" +
+                "      \"smsTemplateCode\": \"true\",\n" +
+                "      \"messageTemplateCode\": \"true\",\n" +
+                "      \"emailTemplateCode\": \"false\",\n" +
+                "      \"appTemplateCode\": \"true\",\n" +
+                "      \"data\": {\n" +
+                "        \"label\": \"能量隔离\",\n" +
+                "        \"type\": \"isolation\",\n" +
+                "        \"nodeId\": \"005\",\n" +
+                "        \"icon\": \"6005.png\",\n" +
+                "        \"workerUserId\": \"181\",\n" +
+                "        \"remark\": \"\",\n" +
+                "        \"formId\": \"\",\n" +
+                "        \"isolationType\": \"1\",\n" +
+                "        \"isolationPoints\": [\n" +
+                "          105,\n" +
+                "          104\n" +
+                "        ],\n" +
+                "        \"isolationNode\": [],\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
+                "        \"lockPerson\": 181,\n" +
+                "        \"coLockPersons\": [\n" +
+                "          117,\n" +
+                "          139,\n" +
+                "          182\n" +
+                "        ],\n" +
+                "        \"notificationMethods\": {\n" +
+                "          \"sms\": true,\n" +
+                "          \"message\": true,\n" +
+                "          \"email\": false,\n" +
+                "          \"app\": true\n" +
+                "        },\n" +
+                "        \"notificationPerson\": \"\",\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"能量隔离\",\n" +
+                "        \"nodeIcon\": \"6005.png\"\n" +
+                "      }\n" +
                 "    },\n" +
-                "    \"nodeName\" : \"能量隔离\",\n" +
-                "    \"nodeIcon\" : \"6005.png\",\n" +
-                "    \"smsTemplateCode\" : \"false\",\n" +
-                "    \"messageTemplateCode\" : \"false\",\n" +
-                "    \"emailTemplateCode\" : \"false\",\n" +
-                "    \"appTemplateCode\" : \"false\",\n" +
-                "    \"data\" : {\n" +
-                "      \"label\" : \"能量隔离\",\n" +
-                "      \"type\" : \"isolation\",\n" +
-                "      \"nodeId\" : \"005\",\n" +
-                "      \"icon\" : \"6005.png\",\n" +
-                "      \"workerUserId\" : \"\",\n" +
-                "      \"remark\" : \"\",\n" +
-                "      \"formId\" : \"55\",\n" +
-                "      \"isolationType\" : \"1\",\n" +
-                "      \"isolationPoints\" : [ 130, 130, 130 ],\n" +
-                "      \"isolationNode\" : [ ],\n" +
-                "      \"isolationNodeUuid\" : \"\",\n" +
-                "      \"lockPerson\" : 249,\n" +
-                "      \"coLockPersons\" : [ 250 ],\n" +
-                "      \"notificationMethods\" : {\n" +
-                "        \"sms\" : false,\n" +
-                "        \"message\" : false,\n" +
-                "        \"email\" : false,\n" +
-                "        \"app\" : false\n" +
+                "    {\n" +
+                "      \"uuid\": \"releaseIsolation-1766650866562\",\n" +
+                "      \"type\": \"releaseIsolation\",\n" +
+                "      \"position\": {\n" +
+                "        \"x\": 764.9565268541271,\n" +
+                "        \"y\": 50.876612170258824\n" +
                 "      },\n" +
-                "      \"notificationPerson\" : \"\",\n" +
-                "      \"notificationTime\" : \"\",\n" +
-                "      \"selectedIsolationNodeId\" : \"\",\n" +
-                "      \"submitForm\" : \"\",\n" +
-                "      \"nodeName\" : \"能量隔离\",\n" +
-                "      \"nodeIcon\" : \"6005.png\"\n" +
-                "    }\n" +
-                "  }, {\n" +
-                "    \"uuid\" : \"releaseIsolation-1766650866562\",\n" +
-                "    \"type\" : \"releaseIsolation\",\n" +
-                "    \"position\" : {\n" +
-                "      \"x\" : 764.9565268541271,\n" +
-                "      \"y\" : 50.876612170258824\n" +
+                "      \"nodeName\": \"解除隔离\",\n" +
+                "      \"nodeIcon\": \"7007.png\",\n" +
+                "      \"smsTemplateCode\": \"true\",\n" +
+                "      \"messageTemplateCode\": \"true\",\n" +
+                "      \"emailTemplateCode\": \"false\",\n" +
+                "      \"appTemplateCode\": \"true\",\n" +
+                "      \"data\": {\n" +
+                "        \"label\": \"解除隔离\",\n" +
+                "        \"type\": \"releaseIsolation\",\n" +
+                "        \"nodeId\": \"006\",\n" +
+                "        \"icon\": \"7007.png\",\n" +
+                "        \"workerUserId\": \"181\",\n" +
+                "        \"remark\": \"\",\n" +
+                "        \"formId\": \"\",\n" +
+                "        \"isolationType\": \"1\",\n" +
+                "        \"isolationPoints\": [\n" +
+                "          105,\n" +
+                "          104\n" +
+                "        ],\n" +
+                "        \"isolationNode\": [],\n" +
+                "        \"isolationNodeUuid\": \"isolation-1766650858056\",\n" +
+                "        \"lockPerson\": 181,\n" +
+                "        \"coLockPersons\": [\n" +
+                "          117,\n" +
+                "          139,\n" +
+                "          182\n" +
+                "        ],\n" +
+                "        \"notificationMethods\": {\n" +
+                "          \"sms\": true,\n" +
+                "          \"message\": true,\n" +
+                "          \"email\": false,\n" +
+                "          \"app\": true\n" +
+                "        },\n" +
+                "        \"notificationPerson\": \"\",\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"selectedIsolationNodeId\": \"isolation-1766650858056\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"解除隔离\",\n" +
+                "        \"nodeIcon\": \"7007.png\"\n" +
+                "      }\n" +
                 "    },\n" +
-                "    \"nodeName\" : \"解除隔离\",\n" +
-                "    \"nodeIcon\" : \"7007.png\",\n" +
-                "    \"smsTemplateCode\" : \"false\",\n" +
-                "    \"messageTemplateCode\" : \"false\",\n" +
-                "    \"emailTemplateCode\" : \"false\",\n" +
-                "    \"appTemplateCode\" : \"false\",\n" +
-                "    \"data\" : {\n" +
-                "      \"label\" : \"解除隔离\",\n" +
-                "      \"type\" : \"releaseIsolation\",\n" +
-                "      \"nodeId\" : \"006\",\n" +
-                "      \"icon\" : \"7007.png\",\n" +
-                "      \"workerUserId\" : \"\",\n" +
-                "      \"remark\" : \"\",\n" +
-                "      \"formId\" : \"54\",\n" +
-                "      \"isolationType\" : \"1\",\n" +
-                "      \"isolationPoints\" : [ 130, 130, 130 ],\n" +
-                "      \"isolationNode\" : [ ],\n" +
-                "      \"isolationNodeUuid\" : \"isolation-1766650858056\",\n" +
-                "      \"lockPerson\" : 249,\n" +
-                "      \"coLockPersons\" : [ 250 ],\n" +
-                "      \"notificationMethods\" : {\n" +
-                "        \"sms\" : false,\n" +
-                "        \"message\" : false,\n" +
-                "        \"email\" : false,\n" +
-                "        \"app\" : false\n" +
+                "    {\n" +
+                "      \"uuid\": \"complete-1766650878643\",\n" +
+                "      \"type\": \"complete\",\n" +
+                "      \"position\": {\n" +
+                "        \"x\": 961.8893632852687,\n" +
+                "        \"y\": 50.305803156917875\n" +
                 "      },\n" +
-                "      \"notificationPerson\" : \"\",\n" +
-                "      \"notificationTime\" : \"\",\n" +
-                "      \"selectedIsolationNodeId\" : \"isolation-1766650858056\",\n" +
-                "      \"submitForm\" : \"\",\n" +
-                "      \"nodeName\" : \"解除隔离\",\n" +
-                "      \"nodeIcon\" : \"7007.png\"\n" +
+                "      \"nodeName\": \"完成/结束\",\n" +
+                "      \"nodeIcon\": \"5006.png\",\n" +
+                "      \"smsTemplateCode\": \"true\",\n" +
+                "      \"messageTemplateCode\": \"true\",\n" +
+                "      \"emailTemplateCode\": \"false\",\n" +
+                "      \"appTemplateCode\": \"true\",\n" +
+                "      \"data\": {\n" +
+                "        \"label\": \"完成/结束\",\n" +
+                "        \"type\": \"complete\",\n" +
+                "        \"nodeId\": \"008\",\n" +
+                "        \"icon\": \"5006.png\",\n" +
+                "        \"workerUserId\": \"182\",\n" +
+                "        \"remark\": \"\",\n" +
+                "        \"formId\": \"\",\n" +
+                "        \"isolationType\": \"\",\n" +
+                "        \"isolationPoints\": [],\n" +
+                "        \"isolationNode\": [],\n" +
+                "        \"isolationNodeUuid\": \"\",\n" +
+                "        \"lockPerson\": \"\",\n" +
+                "        \"coLockPersons\": [],\n" +
+                "        \"notificationMethods\": {\n" +
+                "          \"sms\": true,\n" +
+                "          \"message\": true,\n" +
+                "          \"email\": false,\n" +
+                "          \"app\": true\n" +
+                "        },\n" +
+                "        \"notificationPerson\": \"\",\n" +
+                "        \"notificationTime\": \"\",\n" +
+                "        \"selectedIsolationNodeId\": \"\",\n" +
+                "        \"submitForm\": \"\",\n" +
+                "        \"nodeName\": \"完成/结束\",\n" +
+                "        \"nodeIcon\": \"5006.png\"\n" +
+                "      }\n" +
                 "    }\n" +
-                "  }, {\n" +
-                "    \"uuid\" : \"complete-1766650878643\",\n" +
-                "    \"type\" : \"complete\",\n" +
-                "    \"position\" : {\n" +
-                "      \"x\" : 961.8893632852687,\n" +
-                "      \"y\" : 50.305803156917875\n" +
+                "  ],\n" +
+                "  \"edges\": [\n" +
+                "    {\n" +
+                "      \"id\": \"edge-releaseIsolation-1766650866562-left-source-isolation-1766650858056-right-target-1766650870118\",\n" +
+                "      \"source\": \"releaseIsolation-1766650866562\",\n" +
+                "      \"target\": \"isolation-1766650858056\",\n" +
+                "      \"sourceHandle\": \"left-source\",\n" +
+                "      \"targetHandle\": \"right-target\",\n" +
+                "      \"type\": \"straight\"\n" +
                 "    },\n" +
-                "    \"nodeName\" : \"完成/结束\",\n" +
-                "    \"nodeIcon\" : \"5006.png\",\n" +
-                "    \"smsTemplateCode\" : \"false\",\n" +
-                "    \"messageTemplateCode\" : \"false\",\n" +
-                "    \"emailTemplateCode\" : \"false\",\n" +
-                "    \"appTemplateCode\" : \"false\",\n" +
-                "    \"data\" : {\n" +
-                "      \"label\" : \"完成/结束\",\n" +
-                "      \"type\" : \"complete\",\n" +
-                "      \"nodeId\" : \"008\",\n" +
-                "      \"icon\" : \"5006.png\",\n" +
-                "      \"workerUserId\" : 251,\n" +
-                "      \"remark\" : \"\",\n" +
-                "      \"formId\" : \"58\",\n" +
-                "      \"isolationType\" : \"\",\n" +
-                "      \"isolationPoints\" : [ ],\n" +
-                "      \"isolationNode\" : [ ],\n" +
-                "      \"isolationNodeUuid\" : \"\",\n" +
-                "      \"lockPerson\" : \"\",\n" +
-                "      \"coLockPersons\" : [ ],\n" +
-                "      \"notificationMethods\" : {\n" +
-                "        \"sms\" : false,\n" +
-                "        \"message\" : false,\n" +
-                "        \"email\" : false,\n" +
-                "        \"app\" : false\n" +
-                "      },\n" +
-                "      \"notificationPerson\" : \"\",\n" +
-                "      \"notificationTime\" : \"\",\n" +
-                "      \"selectedIsolationNodeId\" : \"\",\n" +
-                "      \"submitForm\" : \"\",\n" +
-                "      \"nodeName\" : \"完成/结束\",\n" +
-                "      \"nodeIcon\" : \"5006.png\"\n" +
+                "    {\n" +
+                "      \"id\": \"edge-confirm-1766650799337-left-source-createJob-1766650792290-right-target-1766657015939\",\n" +
+                "      \"source\": \"review-1766650839450\",\n" +
+                "      \"target\": \"createJob-1766650792290\",\n" +
+                "      \"sourceHandle\": \"left-source\",\n" +
+                "      \"targetHandle\": \"right-target\",\n" +
+                "      \"type\": \"straight\"\n" +
+                "    },\n" +
+                "    {\n" +
+                "      \"id\": \"edge-confirm-1766650799337-left-source-review-1766650839450-right-target-1767073828489\",\n" +
+                "      \"source\": \"confirm-1766650799337\",\n" +
+                "      \"target\": \"review-1766650839450\",\n" +
+                "      \"sourceHandle\": \"left-source\",\n" +
+                "      \"targetHandle\": \"right-target\",\n" +
+                "      \"type\": \"straight\"\n" +
+                "    },\n" +
+                "    {\n" +
+                "      \"id\": \"edge-isolation-1766650858056-left-source-confirm-1766650799337-right-target-1767073842505\",\n" +
+                "      \"source\": \"isolation-1766650858056\",\n" +
+                "      \"target\": \"confirm-1766650799337\",\n" +
+                "      \"sourceHandle\": \"left-source\",\n" +
+                "      \"targetHandle\": \"right-target\",\n" +
+                "      \"type\": \"straight\"\n" +
+                "    },\n" +
+                "    {\n" +
+                "      \"id\": \"edge-complete-1766650878643-left-source-releaseIsolation-1766650866562-right-target-1767074071353\",\n" +
+                "      \"source\": \"complete-1766650878643\",\n" +
+                "      \"target\": \"releaseIsolation-1766650866562\",\n" +
+                "      \"sourceHandle\": \"left-source\",\n" +
+                "      \"targetHandle\": \"right-target\",\n" +
+                "      \"type\": \"straight\"\n" +
                 "    }\n" +
-                "  } ],\n" +
-                "  \"edges\" : [ {\n" +
-                "    \"id\" : \"edge-releaseIsolation-1766650866562-left-source-isolation-1766650858056-right-target-1766650870118\",\n" +
-                "    \"source\" : \"releaseIsolation-1766650866562\",\n" +
-                "    \"target\" : \"isolation-1766650858056\",\n" +
-                "    \"sourceHandle\" : \"left-source\",\n" +
-                "    \"targetHandle\" : \"right-target\",\n" +
-                "    \"type\" : \"straight\"\n" +
-                "  }, {\n" +
-                "    \"id\" : \"edge-confirm-1766650799337-left-source-createJob-1766650792290-right-target-1766657015939\",\n" +
-                "    \"source\" : \"review-1766650839450\",\n" +
-                "    \"target\" : \"createJob-1766650792290\",\n" +
-                "    \"sourceHandle\" : \"left-source\",\n" +
-                "    \"targetHandle\" : \"right-target\",\n" +
-                "    \"type\" : \"straight\"\n" +
-                "  }, {\n" +
-                "    \"id\" : \"edge-confirm-1766650799337-left-source-review-1766650839450-right-target-1767073828489\",\n" +
-                "    \"source\" : \"confirm-1766650799337\",\n" +
-                "    \"target\" : \"review-1766650839450\",\n" +
-                "    \"sourceHandle\" : \"left-source\",\n" +
-                "    \"targetHandle\" : \"right-target\",\n" +
-                "    \"type\" : \"straight\"\n" +
-                "  }, {\n" +
-                "    \"id\" : \"edge-isolation-1766650858056-left-source-confirm-1766650799337-right-target-1767073842505\",\n" +
-                "    \"source\" : \"isolation-1766650858056\",\n" +
-                "    \"target\" : \"confirm-1766650799337\",\n" +
-                "    \"sourceHandle\" : \"left-source\",\n" +
-                "    \"targetHandle\" : \"right-target\",\n" +
-                "    \"type\" : \"straight\"\n" +
-                "  }, {\n" +
-                "    \"id\" : \"edge-complete-1766650878643-left-source-releaseIsolation-1766650866562-right-target-1767074071353\",\n" +
-                "    \"source\" : \"complete-1766650878643\",\n" +
-                "    \"target\" : \"releaseIsolation-1766650866562\",\n" +
-                "    \"sourceHandle\" : \"left-source\",\n" +
-                "    \"targetHandle\" : \"right-target\",\n" +
-                "    \"type\" : \"straight\"\n" +
-                "  } ]\n" +
-                "}";
+                "  ]\n" +
+                "}\n";
 
         // 初始化ObjectMapper（建议声明为类的成员变量，避免重复创建）
         ObjectMapper objectMapper = new ObjectMapper();
@@ -433,6 +539,17 @@ public class IscsInitApiImpl implements IscsInitApi {
                             dataNode.putNull("workerUserId"); // 若为null则设为JSON null
                         }
                     }
+
+
+                    // 解析表单信息
+                    if ("confirm".equals(nodeType)) {
+                        ObjectNode dataNode = (ObjectNode) nodeObj.get("data");
+                        dataNode.put("formId", String.valueOf(formId1));
+                    }
+                    if ("review".equals(nodeType)) {
+                        ObjectNode dataNode = (ObjectNode) nodeObj.get("data");
+                        dataNode.put("formId", String.valueOf(formId2));
+                    }
                 }
             }
 

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java

@@ -215,24 +215,24 @@ public class TenantServiceImpl implements TenantService {
         Optional<RoleDO> roleDO3 = initRoles.stream().filter(o -> o.getCode().equals("jtcolocker")).findFirst();
         Long user3 = createUser(roleDO3.get().getId(), tenantSaveReqVO3);
 
-        // 作业参与人
+        // 作业负责人
         TenantSaveReqVO tenantSaveReqVO4 = new TenantSaveReqVO();
         tenantSaveReqVO4.setName("温博一");
         tenantSaveReqVO4.setContactName("温博一");
         tenantSaveReqVO4.setUsername("wbyy");
         tenantSaveReqVO4.setPassword("123890hzb");
         tenantSaveReqVO4.setDeptId(deptId);
-        Optional<RoleDO> roleDO4 = initRoles.stream().filter(o -> o.getCode().equals("jtcolocker")).findFirst();
+        Optional<RoleDO> roleDO4 = initRoles.stream().filter(o -> o.getCode().equals("jtdrawer")).findFirst();
         Long workerUserId = createUser(roleDO4.get().getId(), tenantSaveReqVO4);
 
-        // 作业参与人
+        // 作业负责人
         TenantSaveReqVO tenantSaveReqVO5 = new TenantSaveReqVO();
         tenantSaveReqVO5.setName("温博二");
         tenantSaveReqVO5.setContactName("温博二");
         tenantSaveReqVO5.setUsername("wbee");
         tenantSaveReqVO5.setPassword("123890hzb");
         tenantSaveReqVO5.setDeptId(deptId);
-        Optional<RoleDO> roleDO5 = initRoles.stream().filter(o -> o.getCode().equals("jtcolocker")).findFirst();
+        Optional<RoleDO> roleDO5 = initRoles.stream().filter(o -> o.getCode().equals("jtdrawer")).findFirst();
         createUser(roleDO5.get().getId(), tenantSaveReqVO5);
 
         // 整合人员数据