流程

hx-common/service-flow/src/main/java/com/fjhx/mapper/process/ProcessTenantMapper.xml

@@ -10,7 +10,7 @@
                pt.name,
                pt.binding_tenant_id,
                pt.version_number,
-               pt.current
+               pt.current_version
         from process_info pi
                  left join process_tenant pt on pi.id = pt.process_info_id
             ${ew.customSqlSegment}

hx-common/service-flow/src/main/java/com/fjhx/service/process/impl/ProcessTenantServiceImpl.java

@@ -80,7 +80,7 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
         // 判断流程是否存在
         int count = count(Wrappers.<ProcessTenant>lambdaQuery()
                 .eq(ProcessTenant::getBindingTenantId, processTenant.getBindingTenantId())
-                .eq(ProcessTenant::getProcessInfoId, processTenant.getProcessInfoId()));
+                .eq(ProcessTenant::getProcessInfoId, processInfoId));
         Assert.eqZero(count, FlowExplainConstant.PROCESS_EXIST);
 
         // 赋值默认版本号
@@ -102,7 +102,7 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
         // 查询流程最大版本信息
         ProcessTenant newProcessTenant = getOne(Wrappers.<ProcessTenant>lambdaQuery()
                 .eq(ProcessTenant::getProcessInfoId, nodeDetailsVo.getProcessInfoId())
-                .eq(ProcessTenant::getBindingTenantId, nodeDetailsVo.getProcessTenantId())
+                .eq(ProcessTenant::getBindingTenantId, nodeDetailsVo.getBindingTenantId())
                 .orderByDesc(ProcessTenant::getVersionNumber)
                 .last("limit 1")
         );
@@ -117,6 +117,8 @@ public class ProcessTenantServiceImpl extends ServiceImpl<ProcessTenantMapper, P
         // 保存数据
         save(newProcessTenant);
 
+        nodeDetailsVo.setProcessTenantId(newProcessTenant.getId());
+
         // 生成节点
         processNodeButtonService.insertNodeButton(nodeDetailsVo);
 

hx-service-api/service-flow-api/src/main/java/com/fjhx/params/NodeDetailsVo.java

@@ -14,12 +14,17 @@ public class NodeDetailsVo {
     private Long processInfoId;
 
     /**
+     * 绑定租户id
+     */
+    private String bindingTenantId;
+
+    /**
      * 租户流程id
      */
     private Long processTenantId;
 
     /**
-     * 节点详情
+     * 节点详情列表
      */
     private List<ProcessNode> processNodeList;