From 19dbe921d83392f1943c63c5fbeb319077b1a641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E6=9F=B3=E5=8D=8E?= <290631660@qq.com>
Date: Thu, 13 Apr 2023 01:14:18 +0800
Subject: [PATCH 1/6] =?UTF-8?q?[add]=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=EF=BC=9A=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/i18n/messages.properties   |   1 +
 hh-modules/hh-flow/pom.xml                    |   4 +
 .../controller/FlowDefinitionController.java  |  50 +++++-
 .../com/hh/flow/mapper/FlowNodeMapper.java    |  10 ++
 .../flow/service/IFlowDefinitionService.java  |   9 +
 .../com/hh/flow/service/IFlowNodeService.java |  10 ++
 .../impl/FlowDefinitionServiceImpl.java       |  28 ++++
 .../service/impl/FlowNodeServiceImpl.java     |   7 +
 .../com/hh/flow/utils/FlowConfigUtil.java     |   1 -
 .../mapper/flow/FlowDefinitionMapper.xml      |  45 ++++-
 .../resources/mapper/flow/FlowNodeMapper.xml  |   4 +
 .../resources/templates/vue/index.vue.ftlh    |   2 +
 .../resources/templates/xml/mapper.xml.ftlh   |   1 -
 hh-ui/src/api/flow/definition.js              |  17 ++
 hh-ui/src/router/index.js                     |  14 ++
 hh-ui/src/views/flow/definition/design.vue    | 156 ++++++++++++++++++
 hh-ui/src/views/flow/definition/dialog.vue    |   2 +-
 hh-ui/src/views/flow/definition/index.vue     |  24 +--
 18 files changed, 355 insertions(+), 30 deletions(-)
 create mode 100644 hh-ui/src/views/flow/definition/design.vue

diff --git a/hh-admin/src/main/resources/i18n/messages.properties b/hh-admin/src/main/resources/i18n/messages.properties
index f561d733..d75fbe3d 100644
--- a/hh-admin/src/main/resources/i18n/messages.properties
+++ b/hh-admin/src/main/resources/i18n/messages.properties
@@ -42,6 +42,7 @@ no.view.permission=\u60A8\u6CA1\u6709\u67E5\u770B\u6570\u636E\u7684\u6743\u9650\
 controller.page=\u5206\u9875\u67E5\u8BE2\u5931\u8D25
 controller.list=\u67E5\u8BE2\u5217\u8868\u5931\u8D25
 controller.add=\u65B0\u589E\u5931\u8D25
+controller.save=\u4FDD\u5B58\u5931\u8D25
 controller.update=\u66F4\u65B0\u5931\u8D25
 controller.delete=\u5220\u9664\u5931\u8D25
 controller.export=\u5BFC\u51FA\u5931\u8D25
diff --git a/hh-modules/hh-flow/pom.xml b/hh-modules/hh-flow/pom.xml
index 32efdd81..6dd5e86e 100644
--- a/hh-modules/hh-flow/pom.xml
+++ b/hh-modules/hh-flow/pom.xml
@@ -25,5 +25,9 @@
             <groupId>com.hh</groupId>
             <artifactId>hh-operatelog</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.hh</groupId>
+            <artifactId>hh-swagger</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java
index 99fcacdd..b28096ec 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java
@@ -3,16 +3,16 @@ package com.hh.flow.controller;
 import java.util.List;
 import javax.annotation.Resource;
 
+import com.hh.common.utils.ExceptionUtil;
+import com.hh.common.utils.MessageUtils;
+import com.hh.flow.domain.FlowNode;
+import com.hh.flow.service.IFlowNodeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.hh.log.annotaion.Log;
 import com.hh.mybatis.controller.BaseController;
 import com.hh.mybatis.domain.R;
@@ -28,6 +28,7 @@ import com.hh.mybatis.domain.TableDataInfo;
  * @date 2023-04-11
  */
 @Validated
+@Api(value = "流程定义控制器", tags = {"流程定义管理"})
 @RestController
 @RequestMapping("/flow/definition")
 public class FlowDefinitionController extends BaseController<FlowDefinition>
@@ -35,6 +36,9 @@ public class FlowDefinitionController extends BaseController<FlowDefinition>
     @Resource
     private IFlowDefinitionService flowDefinitionService;
 
+    @Resource
+    private IFlowNodeService nodeService;
+
     @Override
     public IFlowDefinitionService getBaseService()
     {
@@ -62,6 +66,18 @@ public class FlowDefinitionController extends BaseController<FlowDefinition>
         return getBaseInfo(id);
     }
 
+    /**
+     * 获取流程定义详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('flow:definition:query')")
+    @GetMapping(value = "/getNodeList/{definitionId}")
+    public R<List<FlowNode>> getNodeList(@PathVariable("definitionId") Long definitionId)
+    {
+        FlowNode flowNode = new FlowNode();
+        flowNode.setDefinitionId(definitionId);
+        return R.ok(nodeService.selectList(flowNode));
+    }
+
     /**
      * 新增流程定义
      */
@@ -73,6 +89,24 @@ public class FlowDefinitionController extends BaseController<FlowDefinition>
         return baseAdd(flowDefinition);
     }
 
+    /**
+     * 保存流程结点
+     */
+    @PreAuthorize("@ss.hasPermi('flow:definition:saveNode')")
+    @Log(title = "流程定义", businessType = BusinessType.INSERT)
+    @PostMapping("/saveNode")
+    public R saveNode(@RequestBody List<FlowNode> nodeList, Long definitionId)
+    {
+        try {
+            flowDefinitionService.saveNode(nodeList, definitionId);
+            return R.ok();
+        } catch (Exception e) {
+            String msg = MessageUtils.message("controller.save");
+            logger.error(msg, e);
+            return R.fail(ExceptionUtil.handleMsg(msg, e));
+        }
+    }
+
     /**
      * 修改流程定义
      */
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowNodeMapper.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowNodeMapper.java
index dc25730a..94085ed5 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowNodeMapper.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowNodeMapper.java
@@ -4,6 +4,8 @@ import com.hh.flow.domain.FlowNode;
 import com.hh.mybatis.mapper.BaseMapper;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -16,4 +18,12 @@ public interface FlowNodeMapper extends BaseMapper<FlowNode> {
     List<FlowNode> queryNewVersionFlowNodeByFlowCode(String flowCode);
 
     List<FlowNode> queryFlowNodeByFlowCodeAndVersion(@NotBlank String flowCode, @NotBlank String version);
+
+    /**
+     * 根据ids批量删除
+     *
+     * @param definitionId 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteByDefinitionId(Long definitionId);
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
index 49dacb79..dd9c1701 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
@@ -1,7 +1,9 @@
 package com.hh.flow.service;
 
 import com.hh.flow.domain.FlowDefinition;
+import com.hh.flow.domain.FlowNode;
 import com.hh.mybatis.service.IBaseService;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -15,4 +17,11 @@ public interface IFlowDefinitionService extends IBaseService<FlowDefinition> {
     List<FlowDefinition> queryByCodeList(List<String> flowCodeList);
 
     void closeFlowByCodeList(List<String> flowCodeList);
+
+    /**
+     * 保存流程结点
+     * @param flowNodeList
+     * @param definitionId
+     */
+    void saveNode(@RequestBody List<FlowNode> flowNodeList, Long definitionId);
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowNodeService.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowNodeService.java
index ccdd64c2..b81ad5a7 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowNodeService.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowNodeService.java
@@ -4,6 +4,8 @@ import com.hh.flow.domain.FlowNode;
 import com.hh.mybatis.service.IBaseService;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -29,4 +31,12 @@ public interface IFlowNodeService extends IBaseService<FlowNode> {
      * @return
      */
     List<FlowNode> queryFlowNodeByFlowCodeAndVersion(@NotBlank String flowCode, @NotBlank String version);
+
+    /**
+     * 根据definitionId批量删除
+     *
+     * @param definitionId 需要删除的数据集合
+     * @return 结果
+     */
+    int deleteByDefinitionId(Long definitionId);
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
index 8b5964d2..15f35d8a 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
@@ -1,13 +1,21 @@
 package com.hh.flow.service.impl;
 
+import com.hh.common.utils.AssertUtil;
 import com.hh.flow.domain.FlowDefinition;
+import com.hh.flow.domain.FlowNode;
+import com.hh.flow.enums.NodeTypeEnum;
 import com.hh.flow.mapper.FlowDefinitionMapper;
 import com.hh.flow.service.IFlowDefinitionService;
+import com.hh.flow.service.IFlowNodeService;
+import com.hh.mybatis.domain.R;
 import com.hh.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 流程定义Service业务层处理
@@ -20,6 +28,9 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
     @Resource
     private FlowDefinitionMapper definitionMapper;
 
+    @Resource
+    private IFlowNodeService nodeService;
+
     @Override
     public FlowDefinitionMapper getBaseMapper() {
         return definitionMapper;
@@ -34,4 +45,21 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
     public void closeFlowByCodeList(List<String> flowCodeList) {
         definitionMapper.closeFlowByCodeList(flowCodeList);
     }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveNode(@RequestBody List<FlowNode> flowNodeList, Long definitionId)
+    {
+        List<Integer> nodeTypes = flowNodeList.stream().map(FlowNode::getNodeType).collect(Collectors.toList());
+        AssertUtil.isTrue(nodeTypes.contains(NodeTypeEnum.start.getKey())
+                && nodeTypes.contains(NodeTypeEnum.end.getKey()), "必须有开始结点和结束结点");
+        FlowDefinition flowDefinition = selectById(definitionId);
+        nodeService.deleteByDefinitionId(definitionId);
+        for (FlowNode flowNode : flowNodeList) {
+            flowNode.setDefinitionId(definitionId);
+            flowNode.setVersion(flowDefinition.getVersion());
+        }
+        nodeService.batchInsert(flowNodeList);
+    }
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowNodeServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowNodeServiceImpl.java
index 523eeaa9..290d9b40 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowNodeServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowNodeServiceImpl.java
@@ -8,6 +8,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -35,4 +37,9 @@ public class FlowNodeServiceImpl extends BaseServiceImpl<FlowNode> implements IF
     public List<FlowNode> queryFlowNodeByFlowCodeAndVersion(@NotBlank String flowCode, @NotBlank String version) {
         return nodeMapper.queryFlowNodeByFlowCodeAndVersion(flowCode, version);
     }
+
+    @Override
+    public int deleteByDefinitionId(Long definitionId){
+        return nodeMapper.deleteByDefinitionId(definitionId);
+    }
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/utils/FlowConfigUtil.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/utils/FlowConfigUtil.java
index 540dc07a..68a61ae5 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/utils/FlowConfigUtil.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/utils/FlowConfigUtil.java
@@ -224,7 +224,6 @@ public class FlowConfigUtil {
             AssertUtil.notBlank(target, "【" + nodeName + "】" + FlowConstant.LOST_DEST_NODE);
             AssertUtil.isFalse(targetSet.contains(target), "[" + nodeName + "]" + FlowConstant.SAME_DEST_NODE);
             targetSet.add(target);
-            String roleCode = skip.getRoleCode();
             String value = skip.getConditionValue();
             AssertUtil.isFalse(conditionSet.contains(value), "[" + nodeName + "]" + FlowConstant.SAME_CONDITION_VALUE);
             conditionSet.add(value);
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
index 69b6b9dc..51093d12 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
@@ -17,6 +17,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag"    column="del_flag"    />
     </resultMap>
 
+    <resultMap id="FlowDefinitionFlowNodeResult" type="FlowDefinition" extends="FlowDefinitionResult">
+        <collection property="nodeList" notNullColumn="sub_id" javaType="java.util.List" resultMap="FlowNodeResult" />
+    </resultMap>
+
+    <resultMap type="FlowNode" id="FlowNodeResult">
+        <result property="id"    column="sub_id"    />
+        <result property="nodeType"    column="sub_node_type"    />
+        <result property="definitionId"    column="sub_definition_id"    />
+        <result property="nodeName"    column="sub_node_name"    />
+        <result property="nodeCode"    column="sub_node_code"    />
+        <result property="version"    column="sub_version"    />
+        <result property="createBy"    column="sub_create_by"    />
+        <result property="createTime"    column="sub_create_time"    />
+        <result property="updateBy"    column="sub_update_by"    />
+        <result property="updateTime"    column="sub_update_time"    />
+        <result property="delFlag"    column="sub_del_flag"    />
+    </resultMap>
+
     <sql id="selectVo">
         select t.id, t.flow_code, t.flow_name, t.version, t.is_publish, t.create_by, t.create_time,
                t.update_by, t.update_time, t.del_flag from flow_definition t
@@ -32,9 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectById" parameterType="Long" resultMap="FlowDefinitionResult">
-        <include refid="selectVo"/>
-        where id = #{id}
+    <select id="selectById" parameterType="Long" resultMap="FlowDefinitionFlowNodeResult">
+        select a.id, a.flow_code, a.flow_name, a.version, a.is_publish, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag,
+               b.id as sub_id, b.node_type as sub_node_type, b.definition_id as sub_definition_id, b.node_name as sub_node_name, b.node_code as sub_node_code, b.version as sub_version, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.del_flag as sub_del_flag
+        from flow_definition a
+                 left join flow_node b on b.definition_id = a.id
+        where a.id = #{id}
     </select>
 
     <select id="queryByCodeList" resultMap="FlowDefinitionResult" parameterType="java.util.List">
@@ -108,4 +129,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <delete id="deleteFlowNodeByDefinitionIds" parameterType="Long">
+        delete from flow_node where definition_id in
+        <foreach item="definitionId" collection="array" open="(" separator="," close=")">
+            #{definitionId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteFlowNodeByDefinitionId" parameterType="Long">
+        delete from flow_node where definition_id = #{definitionId}
+    </delete>
+
+    <insert id="batchFlowNode">
+        insert into flow_node( id, node_type, definition_id, node_name, node_code, version, create_by, create_time, update_by, update_time, del_flag) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.nodeType}, #{item.definitionId}, #{item.nodeName}, #{item.nodeCode}, #{item.version}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.delFlag})
+        </foreach>
+    </insert>
 </mapper>
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml
index 21ef6201..35e301c0 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml
@@ -128,4 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <delete id="deleteByDefinitionId" parameterType="Long">
+        delete from flow_node where definition_id = #{definitionId}
+    </delete>
 </mapper>
diff --git a/hh-modules/hh-generator/src/main/resources/templates/vue/index.vue.ftlh b/hh-modules/hh-generator/src/main/resources/templates/vue/index.vue.ftlh
index 1bf46458..741778a5 100644
--- a/hh-modules/hh-generator/src/main/resources/templates/vue/index.vue.ftlh
+++ b/hh-modules/hh-generator/src/main/resources/templates/vue/index.vue.ftlh
@@ -88,6 +88,7 @@
           v-hasPermi="['${moduleName}:${businessName}:remove']"
         >删除</el-button>
       </el-col>
+        <#if table.exportEnable == 'Y'>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -98,6 +99,7 @@
           v-hasPermi="['${moduleName}:${businessName}:export']"
         >导出</el-button>
       </el-col>
+        </#if>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
diff --git a/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh b/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
index 59e3356c..7595b579 100644
--- a/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
+++ b/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
@@ -65,7 +65,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <#elseIf table.sub>
         select<#list columns as column> a.${column.columnName}<#if column_index + 1 !=  columns?size>,</#if></#list>,
            <#list subTable.columns as column> b.${column.columnName} as sub_${column.columnName}<#if column_index + 1 != subTable.columns?size>,</#if></#list>
-
         from ${tableName} a
         left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
         where a.${pkColumn.columnName} = ${r"#"}{${pkColumn.javaField}}
diff --git a/hh-ui/src/api/flow/definition.js b/hh-ui/src/api/flow/definition.js
index 31366ebe..38717d03 100644
--- a/hh-ui/src/api/flow/definition.js
+++ b/hh-ui/src/api/flow/definition.js
@@ -42,3 +42,20 @@ export function delDefinition(id) {
     method: 'delete'
   })
 }
+
+// 查询流程定义详细
+export function saveNode(data, definitionId) {
+  return request({
+    url: '/flow/definition/saveNode?definitionId=' + definitionId,
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询流程结点详细
+export function getNodeList(definitionId) {
+  return request({
+    url: '/flow/definition/getNodeList/' + definitionId,
+    method: 'get'
+  })
+}
diff --git a/hh-ui/src/router/index.js b/hh-ui/src/router/index.js
index b370bdd9..3d395c09 100644
--- a/hh-ui/src/router/index.js
+++ b/hh-ui/src/router/index.js
@@ -161,6 +161,20 @@ export const dynamicRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
+  },
+  {
+    path: '/flow/flow-design',
+    component: Layout,
+    hidden: true,
+    permissions: ['flow:definition:design'],
+    children: [
+      {
+        path: 'index/:id(\\d+)',
+        component: () => import('@/views/flow/definition/design'),
+        name: 'Design',
+        meta: { title: '设计流程', activeMenu: '/flow/definition' }
+      }
+    ]
   }
 ]
 
diff --git a/hh-ui/src/views/flow/definition/design.vue b/hh-ui/src/views/flow/definition/design.vue
new file mode 100644
index 00000000..b3706c74
--- /dev/null
+++ b/hh-ui/src/views/flow/definition/design.vue
@@ -0,0 +1,156 @@
+<template>
+<div class="app-container">
+  <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddFlowNode">添加</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteFlowNode">删除</el-button>
+      </el-col>
+    </el-row>
+    <el-table :data="nodeList" :row-class-name="rowFlowNodeIndex"
+              :row-style="{ height:'0px' }"
+              :cell-style="{ padding:'2px' }"
+              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              stripe max-height="560"
+              @selection-change="handleFlowNodeSelectionChange" ref="flowNode">
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column label="序号" align="center" prop="index" width="50"/>
+      <el-table-column label="结点类型" prop="nodeType" width="150">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.nodeType" placeholder="请选择结点类型">
+            <el-option
+              v-for="dict in dict.type.node_type"
+              :key="parseInt(dict.value)"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程结点名称" prop="nodeName" width="200">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.nodeName" placeholder="请输入流程结点名称"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程结点编码" prop="nodeCode" width="100">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.nodeCode" placeholder="请输入流程结点编码"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="角色编码" prop="roleCode" width="200">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.roleCode" placeholder="请选择角色编码">
+
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="跳转规则" prop="skipRules" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.skipRules" :disabled="true" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="200" fixed="right" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            v-hasPermi="['flow:definition:skip']"
+          >跳转规则配置</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <div slot="footer" class="dialog-footer" style="text-align: center;margin-left:-100px;margin-top:10px;">
+    <el-button type="primary" @click="submitForm">提交</el-button>
+  </div>
+</div>
+</template>
+
+<script>
+
+import {getNodeList, saveNode} from "@/api/flow/definition";
+
+export default {
+  name: "Design",
+  dicts: ['node_type'],
+  data() {
+    return {
+      // 子表选中数据
+      checkedFlowNode: [],
+      // 流程结点表格数据
+      nodeList: [],
+      definitionId: null,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        // flowCode: [
+        //   { required: true, message: "流程编码不能为空", trigger: "blur" }
+        // ],
+        // version: [
+        //   { required: true, message: "流程版本不能为空", trigger: "blur" }
+        // ],
+        // isPublish: [
+        //   { required: true, message: "是否发布不能为空", trigger: "change" }
+        // ],
+      }
+    };
+  },
+  created() {
+    this.definitionId = this.$route.params && this.$route.params.id;
+    if (this.definitionId) {
+      // 获取表详细信息
+      getNodeList(this.definitionId).then(res => {
+        this.nodeList = res.data;
+      });
+    }
+  },
+  methods: {
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.nodeList = this.nodeList;
+          saveNode(this.form.nodeList, this.definitionId).then(response => {
+            this.$modal.msgSuccess("保存成功");
+          });
+        }
+      });
+    },
+    /** 流程结点序号 */
+    rowFlowNodeIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 流程结点添加按钮操作 */
+    handleAddFlowNode() {
+      let obj = {};
+      obj.nodeType = "";
+      obj.nodeName = "";
+      obj.nodeCode = "";
+      this.nodeList.push(obj);
+    },
+    /** 流程结点删除按钮操作 */
+    handleDeleteFlowNode() {
+      if (this.checkedFlowNode.length == 0) {
+        this.$modal.msgError("请先选择要删除的流程结点数据");
+      } else {
+        const nodeList = this.nodeList;
+        const checkedFlowNode = this.checkedFlowNode;
+        this.nodeList = nodeList.filter(function(item) {
+          return checkedFlowNode.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handleFlowNodeSelectionChange(selection) {
+      this.checkedFlowNode = selection.map(item => item.index)
+    },
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/hh-ui/src/views/flow/definition/dialog.vue b/hh-ui/src/views/flow/definition/dialog.vue
index b1f42e78..f6482a06 100644
--- a/hh-ui/src/views/flow/definition/dialog.vue
+++ b/hh-ui/src/views/flow/definition/dialog.vue
@@ -12,7 +12,7 @@
         <el-form-item label="流程版本" prop="version">
           <el-input v-model="form.version" placeholder="请输入流程版本" maxlength="20" show-word-limit/>
         </el-form-item>
-        <el-form-item label="是否发布" prop="isPublish">
+        <el-form-item label="是否发布" prop="isPublish" v-if="disabled">
           <el-select v-model="form.isPublish" placeholder="请选择是否开启流程">
             <el-option
               v-for="dict in dict.type.is_publish"
diff --git a/hh-ui/src/views/flow/definition/index.vue b/hh-ui/src/views/flow/definition/index.vue
index 04e42b1b..ce2a7c43 100644
--- a/hh-ui/src/views/flow/definition/index.vue
+++ b/hh-ui/src/views/flow/definition/index.vue
@@ -64,16 +64,6 @@
           v-hasPermi="['flow:definition:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['flow:definition:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -98,23 +88,25 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="110" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="200" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            @click="handleDetail(scope.row.id)"
-            v-hasPermi="['flow:definition:detail']"
-          >详情</el-button>
+            @click="handleDesign(scope.row.id)"
+            v-hasPermi="['flow:definition:design']"
+          >设计流程</el-button>
           <el-button
             size="mini"
             type="text"
+            v-if="scope.row.isPublish === 0"
             @click="handleUpdate(scope.row.id)"
             v-hasPermi="['flow:definition:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
+            v-if="scope.row.isPublish === 0"
             @click="handleDelete(scope.row)"
             v-hasPermi="['flow:definition:remove']"
           >删除</el-button>
@@ -203,8 +195,8 @@ export default {
       this.$refs.dialog.show();
     },
     /** 详情按钮操作 */
-    handleDetail(id) {
-      this.$refs.dialog.show(id, true);
+    handleDesign(id) {
+      this.$tab.openPage("设计流程", '/flow/flow-design/index/' + id);
     },
     /** 修改按钮操作 */
     handleUpdate(id) {
-- 
Gitee


From bb17cf0825bb80acc46208802338a017272d712e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E6=9F=B3=E5=8D=8E?= <290631660@qq.com>
Date: Thu, 13 Apr 2023 12:49:07 +0800
Subject: [PATCH 2/6] =?UTF-8?q?[update]=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=EF=BC=9Aserviceimpl=E8=A1=A5=E5=85=85=E4=B8=BB?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=A2=9E=E5=88=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hh/test/domain/TestTree.java     |   4 +-
 .../com/hh/test/mapper/TestMaterMapper.java   |  31 +++++-
 .../service/impl/TestMaterServiceImpl.java    | 104 +++++++++++++++++-
 .../resources/mapper/test/TestMaterMapper.xml |  17 ++-
 .../hh-banner/src/main/resources/banner.txt   |   4 +
 .../resources/templates/java/mapper.java.ftlh |  33 ++++++
 .../templates/java/serviceImpl.java.ftlh      | 104 ++++++++++++++++++
 .../resources/templates/xml/mapper.xml.ftlh   |   6 +-
 8 files changed, 287 insertions(+), 16 deletions(-)

diff --git a/hh-admin/src/main/java/com/hh/test/domain/TestTree.java b/hh-admin/src/main/java/com/hh/test/domain/TestTree.java
index 8ae11568..7c15eec6 100644
--- a/hh-admin/src/main/java/com/hh/test/domain/TestTree.java
+++ b/hh-admin/src/main/java/com/hh/test/domain/TestTree.java
@@ -27,7 +27,7 @@ public class TestTree extends TreeEntity
     @Excel(name = "版本")
     private Long version;
 
-    /** 删除标志 */
-    private Long delFlag;
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
 
 }
diff --git a/hh-admin/src/main/java/com/hh/test/mapper/TestMaterMapper.java b/hh-admin/src/main/java/com/hh/test/mapper/TestMaterMapper.java
index 21440b77..37c8325a 100644
--- a/hh-admin/src/main/java/com/hh/test/mapper/TestMaterMapper.java
+++ b/hh-admin/src/main/java/com/hh/test/mapper/TestMaterMapper.java
@@ -2,14 +2,43 @@ package com.hh.test.mapper;
 
 import com.hh.mybatis.mapper.BaseMapper;
 import com.hh.test.domain.TestMater;
+import com.hh.test.domain.TestSub;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 主子演示Mapper接口
  *
  * @author hh
- * @date 2023-04-07
+ * @date 2023-04-13
  */
 public interface TestMaterMapper extends BaseMapper<TestMater>
 {
 
+    /**
+     * 批量删除子
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTestSubByLegalIds(Collection<? extends Serializable> ids);
+
+    /**
+     * 批量新增子
+     *
+     * @param testSubList 子列表
+     * @return 结果
+     */
+    public int batchTestSub(List<TestSub> testSubList);
+
+
+    /**
+     * 通过主子演示主键删除子信息
+     *
+     * @param id 主子演示ID
+     * @return 结果
+     */
+    public int deleteTestSubByLegalId(Serializable id);
 }
diff --git a/hh-admin/src/main/java/com/hh/test/service/impl/TestMaterServiceImpl.java b/hh-admin/src/main/java/com/hh/test/service/impl/TestMaterServiceImpl.java
index 884d3696..980c4492 100644
--- a/hh-admin/src/main/java/com/hh/test/service/impl/TestMaterServiceImpl.java
+++ b/hh-admin/src/main/java/com/hh/test/service/impl/TestMaterServiceImpl.java
@@ -1,19 +1,29 @@
 package com.hh.test.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.hh.common.utils.DateUtils;
+import com.hh.common.utils.StringUtils;
 import com.hh.mybatis.service.impl.BaseServiceImpl;
+import com.hh.security.utils.SecurityUtils;
 import org.springframework.stereotype.Service;
 import com.hh.test.domain.TestSub;
 import com.hh.test.mapper.TestMaterMapper;
 import com.hh.test.domain.TestMater;
 import com.hh.test.service.ITestMaterService;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 主子演示Service业务层处理
  *
  * @author hh
- * @date 2023-04-07
+ * @date 2023-04-13
  */
 @Service
 public class TestMaterServiceImpl extends BaseServiceImpl<TestMater> implements ITestMaterService
@@ -25,4 +35,96 @@ public class TestMaterServiceImpl extends BaseServiceImpl<TestMater> implements
     public TestMaterMapper getBaseMapper() {
         return testMaterMapper;
     }
+
+    /**
+     * 新增主子演示
+     *
+     * @param testMater 主子演示
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int insert(TestMater testMater)
+    {
+        int rows = super.insert(testMater);
+        insertTestSub(testMater);
+        return rows;
+    }
+
+    /**
+     * 修改主子演示
+     *
+     * @param testMater 主子演示
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int update(TestMater testMater)
+    {
+        testMaterMapper.deleteTestSubByLegalId(testMater.getId());
+        insertTestSub(testMater);
+        return super.update(testMater);
+    }
+
+    /**
+     * 批量删除主子演示
+     *
+     * @param ids 需要删除的主子演示主键
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int deleteByIds(Collection<? extends Serializable> ids)
+    {
+        testMaterMapper.deleteTestSubByLegalIds(ids);
+        return super.deleteByIds(ids);
+    }
+
+    /**
+     * 删除主子演示信息
+     *
+     * @param id 主子演示主键
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int deleteById(Serializable id)
+    {
+        testMaterMapper.deleteTestSubByLegalId(id);
+        return super.deleteById(id);
+    }
+
+    /**
+     * 新增子信息
+     *
+     * @param testMater 主子演示对象
+     */
+    private void insertTestSub(TestMater testMater)
+    {
+        List<TestSub> testSubList = testMater.getTestSubList();
+        Long id = testMater.getId();
+        if (StringUtils.isNotNull(testSubList))
+        {
+            List<TestSub> list = new ArrayList<>();
+            for (TestSub testSub : testSubList)
+            {
+                Date date = ObjectUtil.isNotNull(testSub.getCreateTime())
+                        ? testSub.getCreateTime() : DateUtils.getNowDate();
+                String username = StringUtils.isNotBlank(testSub.getCreateBy())
+                        ? testSub.getCreateBy() : SecurityUtils.getUsernameNe();
+
+                testSub.setLegalId(id);
+                testSub.setCreateTime(date);
+                testSub.setUpdateTime(date);
+                testSub.setCreateBy(username);
+                testSub.setUpdateBy(username);
+                testSub.setDelFlag("0");
+                list.add(testSub);
+            }
+            if (list.size() > 0)
+            {
+                testMaterMapper.batchTestSub(list);
+            }
+        }
+    }
 }
diff --git a/hh-admin/src/main/resources/mapper/test/TestMaterMapper.xml b/hh-admin/src/main/resources/mapper/test/TestMaterMapper.xml
index 650ff116..a367712d 100644
--- a/hh-admin/src/main/resources/mapper/test/TestMaterMapper.xml
+++ b/hh-admin/src/main/resources/mapper/test/TestMaterMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hh.test.mapper.TestMaterMapper">
 
     <resultMap type="TestMater" id="TestMaterResult">
@@ -52,10 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectById" parameterType="Long" resultMap="TestMaterTestSubResult">
         select a.id, a.law_firm_name, a.address, a.file_id, a.del_flag, a.state, a.publish_time, a.create_by, a.create_time, a.update_by, a.update_time,
-            b.id as sub_id, b.legal_id as sub_legal_id, b.lawyer_name as sub_lawyer_name, b.phone as sub_phone, b.brief_introduction as sub_brief_introduction, b.del_flag as sub_del_flag, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time
-
+               b.id as sub_id, b.legal_id as sub_legal_id, b.lawyer_name as sub_lawyer_name, b.phone as sub_phone, b.brief_introduction as sub_brief_introduction, b.del_flag as sub_del_flag, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time
         from test_mater a
-        left join test_sub b on b.legal_id = a.id
+                 left join test_sub b on b.legal_id = a.id
         where a.id = #{id}
     </select>
 
@@ -73,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="lawFirmName != null">#{lawFirmName},</if>
@@ -86,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="update" parameterType="TestMater">
@@ -119,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <delete id="deleteTestSubByLegalIds" parameterType="Long">
         delete from test_sub where legal_id in
-        <foreach item="legalId" collection="array" open="(" separator="," close=")">
+        <foreach item="legalId" collection="list" open="(" separator="," close=")">
             #{legalId}
         </foreach>
     </delete>
@@ -130,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="batchTestSub">
         insert into test_sub( id, legal_id, lawyer_name, phone, brief_introduction, del_flag, create_by, create_time, update_by, update_time) values
-		<foreach item="item" index="index" collection="list" separator=",">
+        <foreach item="item" index="index" collection="list" separator=",">
             ( #{item.id}, #{item.legalId}, #{item.lawyerName}, #{item.phone}, #{item.briefIntroduction}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime})
         </foreach>
     </insert>
diff --git a/hh-framework/hh-banner/src/main/resources/banner.txt b/hh-framework/hh-banner/src/main/resources/banner.txt
index 366813dc..6db88aa5 100644
--- a/hh-framework/hh-banner/src/main/resources/banner.txt
+++ b/hh-framework/hh-banner/src/main/resources/banner.txt
@@ -1,6 +1,8 @@
 Application Version: ${hh.version}
 Spring Boot Version: ${spring-boot.version}
 
+========================================================
+
         ▄▄         ▄▄  ▄▄         ▄▄
        ▐░░▌       ▐░░▌▐░░▌       ▐░░▌
        ▐░░▌       ▐░░▌▐░░▌       ▐░░▌
@@ -12,3 +14,5 @@ Spring Boot Version: ${spring-boot.version}
        ▐░░▌       ▐░░▌▐░░▌       ▐░░▌
        ▐░░▌       ▐░░▌▐░░▌       ▐░░▌
         ▀▀         ▀▀  ▀▀         ▀▀
+
+========================================================
diff --git a/hh-modules/hh-generator/src/main/resources/templates/java/mapper.java.ftlh b/hh-modules/hh-generator/src/main/resources/templates/java/mapper.java.ftlh
index 04c775f6..05c856bd 100644
--- a/hh-modules/hh-generator/src/main/resources/templates/java/mapper.java.ftlh
+++ b/hh-modules/hh-generator/src/main/resources/templates/java/mapper.java.ftlh
@@ -2,6 +2,13 @@ package ${packageName}.mapper;
 
 import com.hh.mybatis.mapper.BaseMapper;
 import ${packageName}.domain.${ClassName};
+<#if table.sub>
+import ${packageName}.domain.${subClassName};
+</#if>
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * ${functionName}Mapper接口
@@ -11,5 +18,31 @@ import ${packageName}.domain.${ClassName};
  */
 public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
 {
+<#if table.sub>
+
+    /**
+     * 批量删除${subTable.functionName}
+     *
+     * @param ${pkColumn.javaField}s 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int delete${subClassName}By${subTableFkClassName}s(Collection<? extends Serializable> ${pkColumn.javaField}s);
+
+    /**
+     * 批量新增${subTable.functionName}
+     *
+     * @param ${subclassName}List ${subTable.functionName}列表
+     * @return 结果
+     */
+    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
+
 
+    /**
+     * 通过${functionName}主键删除${subTable.functionName}信息
+     *
+     * @param ${pkColumn.javaField} ${functionName}ID
+     * @return 结果
+     */
+    public int delete${subClassName}By${subTableFkClassName}(Serializable ${pkColumn.javaField});
+</#if>
 }
diff --git a/hh-modules/hh-generator/src/main/resources/templates/java/serviceImpl.java.ftlh b/hh-modules/hh-generator/src/main/resources/templates/java/serviceImpl.java.ftlh
index e6d0751c..da42ea7e 100644
--- a/hh-modules/hh-generator/src/main/resources/templates/java/serviceImpl.java.ftlh
+++ b/hh-modules/hh-generator/src/main/resources/templates/java/serviceImpl.java.ftlh
@@ -1,6 +1,10 @@
 package ${packageName}.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.hh.common.utils.DateUtils;
+import com.hh.common.utils.StringUtils;
 import com.hh.mybatis.service.impl.BaseServiceImpl;
+import com.hh.security.utils.SecurityUtils;
 <#list columns as column>
     <#if column.javaField == 'createTime' || column.javaField == 'updateTime'>
         <#break>
@@ -13,8 +17,14 @@ import ${packageName}.domain.${subClassName};
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 
 /**
  * ${functionName}Service业务层处理
@@ -32,4 +42,98 @@ public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}> imple
     public ${ClassName}Mapper getBaseMapper() {
         return ${className}Mapper;
     }
+
+<#if table.sub>
+ /**
+     * 新增${functionName}
+     *
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int insert(${ClassName} ${className})
+    {
+        int rows = super.insert(${className});
+        insert${subClassName}(${className});
+        return rows;
+    }
+
+    /**
+     * 修改${functionName}
+     *
+     * @param ${className} ${functionName}
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int update(${ClassName} ${className})
+    {
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
+        insert${subClassName}(${className});
+        return super.update(${className});
+    }
+
+    /**
+     * 批量删除${functionName}
+     *
+     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int deleteBy${pkColumn.capJavaField}s(Collection<? extends Serializable> ${pkColumn.javaField}s)
+    {
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
+        return super.deleteByIds(${pkColumn.javaField}s);
+    }
+
+    /**
+     * 删除${functionName}信息
+     *
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int deleteBy${pkColumn.capJavaField}(Serializable ${pkColumn.javaField})
+    {
+        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
+        return super.deleteById(${pkColumn.javaField});
+    }
+
+    /**
+     * 新增${subTable.functionName}信息
+     *
+     * @param ${className} ${functionName}对象
+     */
+    private void insert${subClassName}(${ClassName} ${className})
+    {
+        List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
+        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
+        if (StringUtils.isNotNull(${subclassName}List))
+        {
+            List<${subClassName}> list = new ArrayList<>();
+            for (${subClassName} ${subclassName} : ${subclassName}List)
+            {
+                Date date = ObjectUtil.isNotNull(${subclassName}.getCreateTime())
+                        ? ${subclassName}.getCreateTime() : DateUtils.getNowDate();
+                String username = StringUtils.isNotBlank(testSub.getCreateBy())
+                        ? ${subclassName}.getCreateBy() : SecurityUtils.getUsernameNe();
+
+                ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
+                ${subclassName}.setCreateTime(date);
+                ${subclassName}.setUpdateTime(date);
+                ${subclassName}.setCreateBy(username);
+                ${subclassName}.setUpdateBy(username);
+                ${subclassName}.setDelFlag("0");
+                list.add(${subclassName});
+            }
+            if (list.size() > 0)
+            {
+                ${className}Mapper.batch${subClassName}(list);
+            }
+        }
+    }
+</#if>
 }
diff --git a/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh b/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
index 7595b579..cd4a9cc4 100644
--- a/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
+++ b/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
@@ -64,9 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t.${pkColumn.columnName} = ${r"#"}{${pkColumn.javaField}}
 <#elseIf table.sub>
         select<#list columns as column> a.${column.columnName}<#if column_index + 1 !=  columns?size>,</#if></#list>,
-           <#list subTable.columns as column> b.${column.columnName} as sub_${column.columnName}<#if column_index + 1 != subTable.columns?size>,</#if></#list>
+              <#list subTable.columns as column> b.${column.columnName} as sub_${column.columnName}<#if column_index + 1 != subTable.columns?size>,</#if></#list>
         from ${tableName} a
-        left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
+             left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
         where a.${pkColumn.columnName} = ${r"#"}{${pkColumn.javaField}}
 </#if>
     </select>
@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="${pkColumn.javaType}">
         delete from ${subTableName} where ${subTableFkName} in
-        <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
+        <foreach item="${subTableFkclassName}" collection="list" open="(" separator="," close=")">
             ${r"#"}{${subTableFkclassName}}
         </foreach>
     </delete>
-- 
Gitee


From ac1e472a6dc16c4b0efefae4e6cd0d3df9ba468a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E6=9F=B3=E5=8D=8E?= <290631660@qq.com>
Date: Thu, 13 Apr 2023 12:57:28 +0800
Subject: [PATCH 3/6] =?UTF-8?q?[sync]=20=E5=90=8C=E6=AD=A5ruoyi-vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hh/common/utils/StringUtils.java |  4 +-
 .../com/hh/quartz/util/JobInvokeUtil.java     |  2 +-
 .../service/impl/SysUserServiceImpl.java      |  9 +-
 hh-ui/src/assets/styles/sidebar.scss          |  2 +-
 hh-ui/src/components/IconSelect/index.vue     | 84 ++++++++++++++-----
 hh-ui/src/components/TopNav/index.vue         |  8 +-
 hh-ui/src/layout/index.vue                    | 12 +--
 hh-ui/src/views/system/menu/index.vue         |  2 +-
 8 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/hh-common/src/main/java/com/hh/common/utils/StringUtils.java b/hh-common/src/main/java/com/hh/common/utils/StringUtils.java
index f1e2e12a..95129e7f 100644
--- a/hh-common/src/main/java/com/hh/common/utils/StringUtils.java
+++ b/hh-common/src/main/java/com/hh/common/utils/StringUtils.java
@@ -325,9 +325,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     }
 
     /**
-     * 判断给定的set列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
+     * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
      *
-     * @param set 给定的集合
+     * @param collection 给定的集合
      * @param array 给定的数组
      * @return boolean 结果
      */
diff --git a/hh-modules/hh-quartz/src/main/java/com/hh/quartz/util/JobInvokeUtil.java b/hh-modules/hh-quartz/src/main/java/com/hh/quartz/util/JobInvokeUtil.java
index 742e6dc6..3e244568 100644
--- a/hh-modules/hh-quartz/src/main/java/com/hh/quartz/util/JobInvokeUtil.java
+++ b/hh-modules/hh-quartz/src/main/java/com/hh/quartz/util/JobInvokeUtil.java
@@ -34,7 +34,7 @@ public class JobInvokeUtil
         }
         else
         {
-            Object bean = Class.forName(beanName).newInstance();
+            Object bean = Class.forName(beanName).getDeclaredConstructor().newInstance();
             invokeMethod(bean, methodName, methodParams);
         }
     }
diff --git a/hh-modules/hh-system/hh-system-biz/src/main/java/com/hh/system/service/impl/SysUserServiceImpl.java b/hh-modules/hh-system/hh-system-biz/src/main/java/com/hh/system/service/impl/SysUserServiceImpl.java
index 7c8ddc37..338daee5 100644
--- a/hh-modules/hh-system/hh-system-biz/src/main/java/com/hh/system/service/impl/SysUserServiceImpl.java
+++ b/hh-modules/hh-system/hh-system-biz/src/main/java/com/hh/system/service/impl/SysUserServiceImpl.java
@@ -498,17 +498,18 @@ public class SysUserServiceImpl implements ISysUserService
                     BeanValidators.validateWithException(validator, user);
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
-                    this.insertUser(user);
+                    userMapper.insertUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                 }
                 else if (isUpdateSupport)
                 {
                     BeanValidators.validateWithException(validator, user);
-                    checkUserAllowed(user);
-                    checkUserDataScope(user.getUserId());
+                    checkUserAllowed(u);
+                    checkUserDataScope(u.getUserId());
+                    user.setUserId(u.getUserId());
                     user.setUpdateBy(operName);
-                    this.updateUser(user);
+                    userMapper.updateUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
                 }
diff --git a/hh-ui/src/assets/styles/sidebar.scss b/hh-ui/src/assets/styles/sidebar.scss
index ed308b8d..abe5b631 100644
--- a/hh-ui/src/assets/styles/sidebar.scss
+++ b/hh-ui/src/assets/styles/sidebar.scss
@@ -1,7 +1,7 @@
 #app {
 
   .main-container {
-    min-height: 100%;
+    height: 100%;
     transition: margin-left .28s;
     margin-left: $base-sidebar-width;
     position: relative;
diff --git a/hh-ui/src/components/IconSelect/index.vue b/hh-ui/src/components/IconSelect/index.vue
index 2ace1224..a9df6fde 100644
--- a/hh-ui/src/components/IconSelect/index.vue
+++ b/hh-ui/src/components/IconSelect/index.vue
@@ -1,14 +1,20 @@
 <!-- @author zhengjie -->
 <template>
   <div class="icon-body">
-    <el-input v-model="name" style="position: relative;" clearable placeholder="请输入图标名称" @clear="filterIcons" @input="filterIcons">
+    <el-input v-model="name" class="icon-search" clearable placeholder="请输入图标名称" @clear="filterIcons" @input="filterIcons">
       <i slot="suffix" class="el-icon-search el-input__icon" />
     </el-input>
     <div class="icon-list">
-      <div v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)">
-        <svg-icon :icon-class="item" style="height: 30px;width: 16px;" />
-        <span>{{ item }}</span>
-      </div>
+      <el-scrollbar>
+        <div class="list-container">
+          <div v-for="(item, index) in iconList" class="icon-item-wrapper" :key="index" @click="selectedIcon(item)">
+            <div :class="['icon-item', { active: activeIcon === item }]">
+              <svg-icon :icon-class="item" class-name="icon" style="height: 30px;width: 16px;" />
+              <span :title="item">{{ item }}</span>
+            </div>
+          </div>
+        </div>
+      </el-scrollbar>
     </div>
   </div>
 </template>
@@ -17,6 +23,11 @@
 import icons from './requireIcons'
 export default {
   name: 'IconSelect',
+  props: {
+    activeIcon: {
+      type: String
+    }
+  },
   data() {
     return {
       name: '',
@@ -43,26 +54,59 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .icon-body {
-    width: 100%;
-    padding: 10px;
-    .icon-list {
-      height: 200px;
-      overflow-y: scroll;
-      div {
+.icon-body {
+  width: 100%;
+  padding: 10px;
+  .icon-search {
+    position: relative;
+    margin-bottom: 5px;
+  }
+  .icon-list {
+    height: 200px;
+    ::v-deep .el-scrollbar {
+      height: 100%;
+      .el-scrollbar__wrap {
+        overflow-x: hidden;
+      }
+    }
+    .list-container {
+      display: flex;
+      flex-wrap: wrap;
+      .icon-item-wrapper {
+        width: calc(100% / 3);
         height: 30px;
         line-height: 30px;
         margin-bottom: -5px;
         cursor: pointer;
-        width: 33%;
-        float: left;
-      }
-      span {
-        display: inline-block;
-        vertical-align: -0.15em;
-        fill: currentColor;
-        overflow: hidden;
+        display: flex;
+        .icon-item {
+          display: flex;
+          max-width: 100%;
+          height: 100%;
+          padding: 0 2px;
+          &:hover {
+            background: #ececec;
+            border-radius: 5px;
+          }
+          .icon {
+            flex-shrink: 0;
+          }
+          span {
+            display: inline-block;
+            vertical-align: -0.15em;
+            fill: currentColor;
+            padding-left: 2px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
+        .icon-item.active {
+          background: #ececec;
+          border-radius: 5px;
+        }
       }
     }
   }
+}
 </style>
diff --git a/hh-ui/src/components/TopNav/index.vue b/hh-ui/src/components/TopNav/index.vue
index 5f0edbef..9fb8dd81 100644
--- a/hh-ui/src/components/TopNav/index.vue
+++ b/hh-ui/src/components/TopNav/index.vue
@@ -127,7 +127,13 @@ export default {
         window.open(key, "_blank");
       } else if (!route || !route.children) {
         // 没有子路由路径内部打开
-        this.$router.push({ path: key });
+        const routeMenu = this.childrenMenus.find(item => item.path === key);
+        if (routeMenu && routeMenu.query) {
+          let query = JSON.parse(routeMenu.query);
+          this.$router.push({ path: key, query: query });
+        } else {
+          this.$router.push({ path: key });
+        }
         this.$store.dispatch('app/toggleSideBarHide', true);
       } else {
         // 显示左侧联动菜单
diff --git a/hh-ui/src/layout/index.vue b/hh-ui/src/layout/index.vue
index a8a6d1df..eadbb147 100644
--- a/hh-ui/src/layout/index.vue
+++ b/hh-ui/src/layout/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
-    <el-scrollbar>
-      <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-      <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
-      <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
+    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+    <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
+    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
+      <el-scrollbar>
         <div :class="{'fixed-header':fixedHeader}">
           <navbar/>
           <tags-view v-if="needTagsView"/>
@@ -12,8 +12,8 @@
         <right-panel>
           <settings/>
         </right-panel>
-      </div>
-    </el-scrollbar>
+      </el-scrollbar>
+    </div>
   </div>
 </template>
 
diff --git a/hh-ui/src/views/system/menu/index.vue b/hh-ui/src/views/system/menu/index.vue
index 2ee25af3..2a83f9e9 100644
--- a/hh-ui/src/views/system/menu/index.vue
+++ b/hh-ui/src/views/system/menu/index.vue
@@ -134,7 +134,7 @@
                 trigger="click"
                 @show="$refs['iconSelect'].reset()"
               >
-                <IconSelect ref="iconSelect" @selected="selected" />
+                <IconSelect ref="iconSelect" @selected="selected" :active-icon="form.icon" />
                 <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
                   <svg-icon
                     v-if="form.icon"
-- 
Gitee


From f471f6922037f0b6f497197b450a9ff10ab150db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E6=9F=B3=E5=8D=8E?= <290631660@qq.com>
Date: Fri, 14 Apr 2023 19:05:00 +0800
Subject: [PATCH 4/6] =?UTF-8?q?[update]=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=EF=BC=9B=E9=A1=B5=E9=9D=A2=E9=85=8D=E7=BD=AE=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hh/common/utils/AssertUtil.java  |  20 +++-
 .../com/hh/mybatis/mapper/BaseMapper.java     |   8 ++
 .../com/hh/mybatis/service/IBaseService.java  |  16 +++
 .../mybatis/service/impl/BaseServiceImpl.java |  25 ++++
 .../com/hh/flow/constant/FlowConstant.java    |   5 +-
 .../controller/FlowDefinitionController.java  |  66 ++++++++--
 .../java/com/hh/flow/domain/FlowNode.java     |  16 +++
 .../java/com/hh/flow/domain/FlowSkip.java     |  10 --
 .../{NodeTypeEnum.java => NodeType.java}      |   8 +-
 .../java/com/hh/flow/enums/PublishStatus.java |  55 +++++++++
 .../flow/facade/FlowManagerServiceImpl.java   |  88 ++++++--------
 .../hh/flow/mapper/FlowDefinitionMapper.java  |  37 ++++++
 .../com/hh/flow/mapper/FlowNodeMapper.java    |   4 +-
 .../com/hh/flow/mapper/FlowSkipMapper.java    |   7 ++
 .../flow/service/IFlowDefinitionService.java  |  29 +++++
 .../com/hh/flow/service/IFlowNodeService.java |   4 +-
 .../com/hh/flow/service/IFlowSkipService.java |  10 ++
 .../impl/FlowDefinitionServiceImpl.java       | 113 +++++++++++++++++-
 .../service/impl/FlowInstanceServiceImpl.java |   4 +-
 .../service/impl/FlowSkipServiceImpl.java     |  18 +++
 .../com/hh/flow/utils/FlowConfigUtil.java     |  42 +++----
 .../mapper/flow/FlowDefinitionMapper.xml      |  52 ++++----
 .../resources/mapper/flow/FlowNodeMapper.xml  |  16 ++-
 .../resources/mapper/flow/FlowSkipMapper.xml  |  20 +---
 .../resources/templates/xml/mapper.xml.ftlh   |  10 ++
 hh-ui/src/api/flow/definition.js              |  27 ++++-
 hh-ui/src/router/index.js                     |   2 +-
 hh-ui/src/views/flow/definition/design.vue    |  72 +++++++----
 hh-ui/src/views/flow/definition/index.vue     |  65 ++++++----
 .../src/views/flow/definition/skipDialog.vue  | 113 ++++++++++++++++++
 30 files changed, 752 insertions(+), 210 deletions(-)
 rename hh-modules/hh-flow/src/main/java/com/hh/flow/enums/{NodeTypeEnum.java => NodeType.java} (79%)
 create mode 100644 hh-modules/hh-flow/src/main/java/com/hh/flow/enums/PublishStatus.java
 create mode 100644 hh-ui/src/views/flow/definition/skipDialog.vue

diff --git a/hh-common/src/main/java/com/hh/common/utils/AssertUtil.java b/hh-common/src/main/java/com/hh/common/utils/AssertUtil.java
index c47bf86f..44e2db43 100644
--- a/hh-common/src/main/java/com/hh/common/utils/AssertUtil.java
+++ b/hh-common/src/main/java/com/hh/common/utils/AssertUtil.java
@@ -15,25 +15,37 @@ public class AssertUtil {
 
     }
 
-    public static void notNull(Object obj, String errorMsg) {
+    public static void isNull(Object obj, String errorMsg) {
         if (obj == null) {
             throw new ServiceException(errorMsg);
         }
     }
 
-    public static void notBlank(String obj, String errorMsg) {
+    public static void isNotNull(Object obj, String errorMsg) {
+        if (obj != null) {
+            throw new ServiceException(errorMsg);
+        }
+    }
+
+    public static void isBlank(String obj, String errorMsg) {
         if (StringUtil.isEmpty(obj)) {
             throw new ServiceException(errorMsg);
         }
     }
 
-    public static void isTrue(boolean obj, String errorMsg) {
-        if (!obj) {
+    public static void isNotBlank(String obj, String errorMsg) {
+        if (StringUtil.isNotEmpty(obj)) {
             throw new ServiceException(errorMsg);
         }
     }
 
     public static void isFalse(boolean obj, String errorMsg) {
+        if (!obj) {
+            throw new ServiceException(errorMsg);
+        }
+    }
+
+    public static void isTrue(boolean obj, String errorMsg) {
         if (obj) {
             throw new ServiceException(errorMsg);
         }
diff --git a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/mapper/BaseMapper.java b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/mapper/BaseMapper.java
index 0db474e2..23c52363 100644
--- a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/mapper/BaseMapper.java
+++ b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/mapper/BaseMapper.java
@@ -22,6 +22,14 @@ public interface BaseMapper<T extends BaseEntity>
      */
     T selectById(Serializable id);
 
+    /**
+     * 根据ids查询
+     *
+     * @param ids 主键
+     * @return 实体
+     */
+    List<T> selectByIds(Collection<? extends Serializable> ids);
+
     /**
      * 查询列表
      *
diff --git a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java
index 25fec44f..acf5d500 100644
--- a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java
+++ b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java
@@ -22,6 +22,14 @@ public interface IBaseService<T extends BaseEntity>
      */
     T selectById(Serializable id);
 
+    /**
+     * 根据ids查询
+     *
+     * @param ids 主键
+     * @return 实体
+     */
+    List<T> selectByIds(Collection<? extends Serializable> ids);
+
     /**
      * 查询列表
      *
@@ -30,6 +38,14 @@ public interface IBaseService<T extends BaseEntity>
      */
     List<T> selectList(T entity);
 
+    /**
+     * 查询一条记录
+     *
+     * @param entity 实体列表
+     * @return 结果
+     */
+    T selectOne(T entity);
+
     /**
      * 新增
      *
diff --git a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java
index 1c69d7c0..28a43ec7 100644
--- a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java
+++ b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java
@@ -53,6 +53,17 @@ public abstract class BaseServiceImpl<T extends BaseEntity> implements IBaseServ
         return getBaseMapper().selectById(id);
     }
 
+    /**
+     * 根据ids查询
+     *
+     * @param ids 主键
+     * @return 实体
+     */
+    @Override
+    public List<T> selectByIds(Collection<? extends Serializable> ids) {
+        return getBaseMapper().selectByIds(ids);
+    }
+
     /**
      * 查询列表
      *
@@ -64,6 +75,19 @@ public abstract class BaseServiceImpl<T extends BaseEntity> implements IBaseServ
         return getBaseMapper().selectList(entity);
     }
 
+    /**
+     * 查询一条记录
+     *
+     * @param entity 实体列表
+     * @return 结果
+     */
+    @Override
+    public T selectOne(T entity) {
+        List<T> list = getBaseMapper().selectList(entity);
+
+        return CollUtil.isEmpty(list) ? null: list.get(0);
+    }
+
     /**
      * 新增
      *
@@ -72,6 +96,7 @@ public abstract class BaseServiceImpl<T extends BaseEntity> implements IBaseServ
      */
     @Override
     public int insert(T entity) {
+
         DataFillHandler dataFillHandler = SpringUtils.getBeanNoException(DataFillHandler.class);
         if (ObjectUtil.isNotNull(dataFillHandler)) {
             dataFillHandler.insertFill(entity);
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/constant/FlowConstant.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/constant/FlowConstant.java
index 439a7954..47309a09 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/constant/FlowConstant.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/constant/FlowConstant.java
@@ -12,7 +12,7 @@ public class FlowConstant {
 
     public static final String SAME_CONDITION_VALUE = "同一个结点不能有相同的跳转条件!";
 
-    public static final String SAME_DEST_NODE = "同一起点下多个跳转指向同一个目标结点!";
+    public static final String SAME_DEST_NODE = "同一结点不能跳转同一个目标结点!";
 
     public static final String SAME_FLOW_CODE = "相同流程的编码的不能重复,!";
 
@@ -32,6 +32,9 @@ public class FlowConstant {
 
     public static final String NULL_DEST_NODE = "无法跳转到结点,请检查跳转条件和当前角色是否匹配!";
 
+    public static final String NULL_CONDITIONVALUE_NODE = "无法跳转到结点,请检查跳转条件是否匹配!";
+    public static final String NULL_ROLE_NODE = "无法跳转到结点,请检查当前角色是否匹配!";
+
     public static final String MEANINGLESS_CONDITION = "开始结点不需要设置跳转条件和角色!";
 
     public static final String MUL_BUSINESS_ID = "当前业务id已经创建过流程!";
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java
index b28096ec..696224df 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java
@@ -6,10 +6,10 @@ import javax.annotation.Resource;
 import com.hh.common.utils.ExceptionUtil;
 import com.hh.common.utils.MessageUtils;
 import com.hh.flow.domain.FlowNode;
+import com.hh.flow.domain.FlowSkip;
 import com.hh.flow.service.IFlowNodeService;
+import com.hh.flow.service.IFlowSkipService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -34,15 +34,18 @@ import com.hh.mybatis.domain.TableDataInfo;
 public class FlowDefinitionController extends BaseController<FlowDefinition>
 {
     @Resource
-    private IFlowDefinitionService flowDefinitionService;
+    private IFlowDefinitionService definitionService;
 
     @Resource
     private IFlowNodeService nodeService;
 
+    @Resource
+    private IFlowSkipService skipService;
+
     @Override
     public IFlowDefinitionService getBaseService()
     {
-        return flowDefinitionService;
+        return definitionService;
     }
 
     /**
@@ -73,9 +76,19 @@ public class FlowDefinitionController extends BaseController<FlowDefinition>
     @GetMapping(value = "/getNodeList/{definitionId}")
     public R<List<FlowNode>> getNodeList(@PathVariable("definitionId") Long definitionId)
     {
-        FlowNode flowNode = new FlowNode();
-        flowNode.setDefinitionId(definitionId);
-        return R.ok(nodeService.selectList(flowNode));
+        return R.ok(definitionService.getNodeList(definitionId));
+    }
+
+    /**
+     * 获取流程定义详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('flow:definition:query')")
+    @GetMapping(value = "/getSkipList/{nodeId}")
+    public R<List<FlowSkip>> getSkipList(@PathVariable("nodeId") Long nodeId)
+    {
+        FlowSkip skip = new FlowSkip();
+        skip.setNodeId(nodeId);
+        return R.ok(skipService.selectList(skip));
     }
 
     /**
@@ -89,6 +102,17 @@ public class FlowDefinitionController extends BaseController<FlowDefinition>
         return baseAdd(flowDefinition);
     }
 
+    /**
+     * 发布流程定义
+     */
+    @PreAuthorize("@ss.hasPermi('flow:definition:publish')")
+    @Log(title = "流程定义", businessType = BusinessType.INSERT)
+    @GetMapping("/publish/{id}")
+    public R publish(@PathVariable("id") Long id)
+    {
+        return toR(definitionService.publish(id));
+    }
+
     /**
      * 保存流程结点
      */
@@ -98,7 +122,25 @@ public class FlowDefinitionController extends BaseController<FlowDefinition>
     public R saveNode(@RequestBody List<FlowNode> nodeList, Long definitionId)
     {
         try {
-            flowDefinitionService.saveNode(nodeList, definitionId);
+            definitionService.saveNode(nodeList, definitionId);
+            return R.ok();
+        } catch (Exception e) {
+            String msg = MessageUtils.message("controller.save");
+            logger.error(msg, e);
+            return R.fail(ExceptionUtil.handleMsg(msg, e));
+        }
+    }
+
+    /**
+     * 保存流程跳转
+     */
+    @PreAuthorize("@ss.hasPermi('flow:definition:saveNode')")
+    @Log(title = "流程定义", businessType = BusinessType.INSERT)
+    @PostMapping("/saveSkip")
+    public R saveSkip(@RequestBody List<FlowSkip> skipList, Long nodeId)
+    {
+        try {
+            definitionService.saveSkip(skipList, nodeId);
             return R.ok();
         } catch (Exception e) {
             String msg = MessageUtils.message("controller.save");
@@ -126,6 +168,12 @@ public class FlowDefinitionController extends BaseController<FlowDefinition>
 	@DeleteMapping("/{ids}")
     public R remove(@PathVariable List<Long> ids)
     {
-        return baserRemove(ids);
+        try {
+            return toR(definitionService.remove(ids));
+        } catch (Exception e) {
+            String msg = MessageUtils.message("controller.delete");
+            logger.error(msg, e);
+            return R.fail(ExceptionUtil.handleMsg(msg, e));
+        }
     }
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowNode.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowNode.java
index 6c8bf45f..4f6d876b 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowNode.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowNode.java
@@ -34,6 +34,17 @@ public class FlowNode extends BaseEntity {
      * 流程结点编码   每个流程的nodeCode是唯一的,即definitionId+nodeCode唯一,在数据库层面做了控制
      */
     private String nodeCode;
+
+    /**
+     * 角色编码(该结点能被哪些角色审核)
+     */
+    private String roleCode;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
     /**
      * 版本
      */
@@ -44,6 +55,11 @@ public class FlowNode extends BaseEntity {
      */
     private String delFlag;
 
+    /**
+     * 跳转规则描述
+     */
+    private String skipDescribe;
+
     /**
      * 跳转条件
      */
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowSkip.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowSkip.java
index 1eb83a4e..6d2990a4 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowSkip.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowSkip.java
@@ -30,16 +30,6 @@ public class FlowSkip extends BaseEntity {
      */
     private String nowNodeCode;
 
-    /**
-     * 角色编码(该结点能被哪些角色审核)
-     */
-    private String roleCode;
-
-    /**
-     * 角色名称
-     */
-    private String roleName;
-
     /**
      * 下一个流程结点的编码
      */
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/enums/NodeTypeEnum.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/enums/NodeType.java
similarity index 79%
rename from hh-modules/hh-flow/src/main/java/com/hh/flow/enums/NodeTypeEnum.java
rename to hh-modules/hh-flow/src/main/java/com/hh/flow/enums/NodeType.java
index 99cdd565..aa5cb3f7 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/enums/NodeTypeEnum.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/enums/NodeType.java
@@ -5,7 +5,7 @@ package com.hh.flow.enums;
  * @author minliuhua
  * @date: 2023/3/31 12:16
  */
-public enum NodeTypeEnum {
+public enum NodeType {
 	start(0,"start"),
 	between(1,"between"),
 	end(2,"end");
@@ -13,7 +13,7 @@ public enum NodeTypeEnum {
 	private Integer key;
 	private String value;
 
-	private NodeTypeEnum(Integer key, String value)
+	private NodeType(Integer key, String value)
 	{
 		this.key = key;
 		this.value = value;
@@ -31,7 +31,7 @@ public enum NodeTypeEnum {
 
 	public static Integer getKeyByValue(String value)
 	{
-		for (NodeTypeEnum item : NodeTypeEnum.values())
+		for (NodeType item : NodeType.values())
 		{
 			if (item.getValue().equals(value))
 			{
@@ -43,7 +43,7 @@ public enum NodeTypeEnum {
 
 	public static String getValueByKey(Integer key)
 	{
-		for (NodeTypeEnum item : NodeTypeEnum.values())
+		for (NodeType item : NodeType.values())
 		{
 			if (item.getKey().equals(key))
 			{
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/enums/PublishStatus.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/enums/PublishStatus.java
new file mode 100644
index 00000000..d5e7ea93
--- /dev/null
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/enums/PublishStatus.java
@@ -0,0 +1,55 @@
+package com.hh.flow.enums;
+
+/**
+ * @description:  结点类型
+ * @author minliuhua
+ * @date: 2023/3/31 12:16
+ */
+public enum PublishStatus {
+	EXPIRED(9,"已失效"),
+	UNPUBLISHED(0,"未发布"),
+	PUBLISHED(1,"已发布");
+
+	private Integer key;
+	private String value;
+
+	private PublishStatus(Integer key, String value)
+	{
+		this.key = key;
+		this.value = value;
+	}
+
+	public Integer getKey()
+	{
+		return key;
+	}
+
+	public String getValue()
+	{
+		return value;
+	}
+
+	public static Integer getKeyByValue(String value)
+	{
+		for (PublishStatus item : PublishStatus.values())
+		{
+			if (item.getValue().equals(value))
+			{
+				return item.getKey();
+			}
+		}
+		return null;
+	}
+
+	public static String getValueByKey(Integer key)
+	{
+		for (PublishStatus item : PublishStatus.values())
+		{
+			if (item.getKey().equals(key))
+			{
+				return item.getValue();
+			}
+		}
+		return null;
+	}
+}
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/facade/FlowManagerServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/facade/FlowManagerServiceImpl.java
index d1ab4bd9..12204517 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/facade/FlowManagerServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/facade/FlowManagerServiceImpl.java
@@ -5,7 +5,7 @@ import com.hh.common.utils.AssertUtil;
 import com.hh.common.utils.uuid.IdUtils;
 import com.hh.flow.constant.FlowConstant;
 import com.hh.flow.domain.*;
-import com.hh.flow.enums.NodeTypeEnum;
+import com.hh.flow.enums.NodeType;
 import com.hh.flow.service.*;
 import com.hh.flow.utils.FlowConfigUtil;
 import com.hh.flow.vo.FlowCombine;
@@ -59,8 +59,8 @@ public class FlowManagerServiceImpl implements FlowManagerService {
     public FlowInstance startFlow(String businessId
             , FlowParams flowUser) {
 
-        AssertUtil.notNull(flowUser.getFlowCode(), FlowConstant.NULL_FLOW_CODE);
-        AssertUtil.notBlank(businessId, FlowConstant.NULL_BUSINESS_ID);
+        AssertUtil.isNull(flowUser.getFlowCode(), FlowConstant.NULL_FLOW_CODE);
+        AssertUtil.isBlank(businessId, FlowConstant.NULL_BUSINESS_ID);
         // 根据流程编码获取开启的唯一流程的流程结点集合
         List<FlowNode> nodes = nodeService.queryNewVersionFlowNodeByFlowCode(flowUser.getFlowCode());
         // 获取开始结点
@@ -72,8 +72,8 @@ public class FlowManagerServiceImpl implements FlowManagerService {
     @Transactional(rollbackFor = Exception.class)
     public List<FlowInstance> startFlow(List<String> businessIds
             , FlowParams flowUser) {
-        AssertUtil.notNull(flowUser.getFlowCode(), FlowConstant.NULL_FLOW_CODE);
-        AssertUtil.isFalse(businessIds == null || businessIds.size() == 0, FlowConstant.NULL_BUSINESS_ID);
+        AssertUtil.isNull(flowUser.getFlowCode(), FlowConstant.NULL_FLOW_CODE);
+        AssertUtil.isTrue(businessIds == null || businessIds.size() == 0, FlowConstant.NULL_BUSINESS_ID);
         // 根据流程编码获取开启的唯一流程的流程结点集合
         List<FlowNode> nodes = nodeService.queryNewVersionFlowNodeByFlowCode(flowUser.getFlowCode());
         // 获取开始结点
@@ -85,9 +85,9 @@ public class FlowManagerServiceImpl implements FlowManagerService {
     @Transactional(rollbackFor = Exception.class)
     public FlowInstance startFlow(String businessId, String version
             , FlowParams flowUser) {
-        AssertUtil.notNull(flowUser.getFlowCode(), FlowConstant.NULL_FLOW_CODE);
-        AssertUtil.notBlank(businessId, FlowConstant.NULL_BUSINESS_ID);
-        AssertUtil.notBlank(version, FlowConstant.NULL_FLOW_VERSION);
+        AssertUtil.isNull(flowUser.getFlowCode(), FlowConstant.NULL_FLOW_CODE);
+        AssertUtil.isBlank(businessId, FlowConstant.NULL_BUSINESS_ID);
+        AssertUtil.isBlank(version, FlowConstant.NULL_FLOW_VERSION);
         // 根据流程编码+版本号确定唯一的流程结点集合
         List<FlowNode> nodes = nodeService.queryFlowNodeByFlowCodeAndVersion(flowUser.getFlowCode(), version);
         // 获取开始结点
@@ -99,9 +99,9 @@ public class FlowManagerServiceImpl implements FlowManagerService {
     @Transactional(rollbackFor = Exception.class)
     public List<FlowInstance> startFlow(List<String> businessIds, String version
             , FlowParams flowUser) {
-        AssertUtil.notNull(flowUser.getFlowCode(), FlowConstant.NULL_FLOW_CODE);
-        AssertUtil.isFalse(businessIds == null || businessIds.size() == 0, FlowConstant.NULL_BUSINESS_ID);
-        AssertUtil.notBlank(version, FlowConstant.NULL_FLOW_VERSION);
+        AssertUtil.isNull(flowUser.getFlowCode(), FlowConstant.NULL_FLOW_CODE);
+        AssertUtil.isTrue(businessIds == null || businessIds.size() == 0, FlowConstant.NULL_BUSINESS_ID);
+        AssertUtil.isBlank(version, FlowConstant.NULL_FLOW_VERSION);
         // 根据流程编码+版本号确定唯一的流程结点集合
         List<FlowNode> nodes = nodeService.queryFlowNodeByFlowCodeAndVersion(flowUser.getFlowCode(), version);
         // 获取开始结点
@@ -131,11 +131,11 @@ public class FlowManagerServiceImpl implements FlowManagerService {
     @Transactional(rollbackFor = Exception.class)
     public List<FlowInstance> skipFlow(List<Long> definitionIds, String conditionValue, String message
             , FlowParams flowUser) {
-        AssertUtil.isFalse(message != null && message.length() > 500, FlowConstant.MSG_OVER_LENGTH);
+        AssertUtil.isTrue(message != null && message.length() > 500, FlowConstant.MSG_OVER_LENGTH);
         // 获取当前流程
         List<FlowInstance> instances = instanceService.queryByidWithUpdateLock(definitionIds);
-        AssertUtil.isFalse(instances == null || instances.size() == 0, FlowConstant.NOT_FOUNT_INSTANCE);
-        AssertUtil.isFalse(instances.size() < definitionIds.size(), FlowConstant.LOST_FOUNT_FLOW);
+        AssertUtil.isTrue(instances == null || instances.size() == 0, FlowConstant.NOT_FOUNT_INSTANCE);
+        AssertUtil.isTrue(instances.size() < definitionIds.size(), FlowConstant.LOST_FOUNT_FLOW);
         // 校验这些流程的流程状态是否相同，只有相同的情况下，下面才好做统一处理
         checkSameStatus(instances);
         List<FlowInsHis> insHisList = new ArrayList<>();
@@ -191,7 +191,7 @@ public class FlowManagerServiceImpl implements FlowManagerService {
         List<FlowInsHis> insHisList = new ArrayList<>();
         for (int i = 0; i < ids.size(); i++) {
             String businessId = ids.get(i);
-            AssertUtil.notBlank(businessId, FlowConstant.NULL_BUSINESS_ID);
+            AssertUtil.isBlank(businessId, FlowConstant.NULL_BUSINESS_ID);
             // 设置流程实例对象
             FlowInstance instance = setStartInstance(startNode, businessId, flowUser);
             // 设置流程实例历史记录对象
@@ -314,45 +314,27 @@ public class FlowManagerServiceImpl implements FlowManagerService {
         if (skips == null || skips.size() == 0) {
             return null;
         }
+        // TODO min 后续抽取用户角色
+        List<FlowRole> roleList = flowUser.getRoles();
+        AssertUtil.isTrue(roleList == null || roleList.size() == 0, FlowConstant.NOT_ROLE_PERMISSIONS);
+        List<String> roleKeys = roleList.stream().map(FlowRole::getRoleKey).collect(Collectors.toList());
+        FlowNode flowNode = new FlowNode();
+        flowNode.setDefinitionId(instance.getDefinitionId());
+        flowNode.setNodeCode(instance.getNodeCode());
+        FlowNode node = nodeService.selectOne(flowNode);
+        AssertUtil.isFalse(roleKeys.contains(node.getRoleCode()), FlowConstant.NULL_ROLE_NODE);
+
         // 第一个结点不需要过滤
-        if (!NodeTypeEnum.start.getKey().equals(instance.getFlowStatus())) {
+        if (!NodeType.start.getKey().equals(instance.getFlowStatus())) {
             if (StringUtils.isBlank(conditionValue)) {
                 skips = skips.stream().filter(t -> StringUtils.isBlank(t.getConditionValue())).collect(Collectors.toList());
             } else {
                 skips = skips.stream().filter(t -> conditionValue.equals(t.getConditionValue())).collect(Collectors.toList());
             }
         }
-
-        // TODO min 后续抽取用户角色
-        List<FlowRole> roleList = flowUser.getRoles();
-        AssertUtil.isFalse(roleList == null || roleList.size() == 0, FlowConstant.NOT_ROLE_PERMISSIONS);
-        for (int i = skips.size() - 1; i >= 0; i--)
-        {
-        	int j = 0;
-        	for (; j < roleList.size(); j++)
-        	{
-        		if (StringUtils.isBlank(skips.get(i).getRoleCode()))
-        		{
-        			break;// 无需做角色过滤
-        		}
-        		else if (skips.get(i).getRoleCode().equals(roleList.get(j).getRoleKey()))
-        		{
-        			break;
-        		}
-        	}
-        	if (j == roleList.size())
-        	{// 未匹配到角色
-        		skips.remove(i);
-        	}
-        }
-        AssertUtil.isFalse(skips.size() > 1, FlowConstant.MUL_DEST_NODE);
-        AssertUtil.isFalse(skips.size() == 0, FlowConstant.NULL_DEST_NODE);
-        if (skips.size() == 0) {
-            return null;
-        } else {
-            // 第一个结点
-            return skips.get(0);
-        }
+        AssertUtil.isTrue(skips.size() == 0, FlowConstant.NULL_CONDITIONVALUE_NODE);
+        // 第一个结点
+        return skips.get(0);
     }
 
     /**
@@ -366,8 +348,8 @@ public class FlowManagerServiceImpl implements FlowManagerService {
      */
     private FlowNode getNextNode(FlowInstance instance, String conditionValue
             , FlowParams flowUser) {
-        AssertUtil.notNull(instance.getDefinitionId(), FlowConstant.NOT_DEFINITION_ID);
-        AssertUtil.notBlank(instance.getNodeCode(), FlowConstant.LOST_NODE_CODE);
+        AssertUtil.isNull(instance.getDefinitionId(), FlowConstant.NOT_DEFINITION_ID);
+        AssertUtil.isBlank(instance.getNodeCode(), FlowConstant.LOST_NODE_CODE);
         FlowSkip skipCondition = new FlowSkip();
         skipCondition.setDefinitionId(instance.getDefinitionId());
         List<FlowSkip> skips = skipService.selectList(skipCondition);
@@ -387,13 +369,13 @@ public class FlowManagerServiceImpl implements FlowManagerService {
         }
         List<FlowSkip> flowSkips = skipMap.get(instance.getNodeCode());
         FlowSkip nextSkip = checkAuthAndCondition(instance, flowSkips, conditionValue, flowUser);
-        AssertUtil.isFalse(nextSkip == null, FlowConstant.NULL_DEST_NODE);
+        AssertUtil.isTrue(nextSkip == null, FlowConstant.NULL_DEST_NODE);
         FlowNode query = new FlowNode();
         query.setDefinitionId(instance.getDefinitionId());
         query.setNodeCode(nextSkip.getNextNodeCode());
         List<FlowNode> nodes = nodeService.selectList(query);
-        AssertUtil.isFalse(nodes.size() == 0, FlowConstant.NOT_NODE_DATA);
-        AssertUtil.isFalse(nodes.size() > 1, "[" + nextSkip.getNextNodeCode() + "]" + FlowConstant.SAME_NODE_CODE);
+        AssertUtil.isTrue(nodes.size() == 0, FlowConstant.NOT_NODE_DATA);
+        AssertUtil.isTrue(nodes.size() > 1, "[" + nextSkip.getNextNodeCode() + "]" + FlowConstant.SAME_NODE_CODE);
         return nodes.get(0);
 
     }
@@ -406,7 +388,7 @@ public class FlowManagerServiceImpl implements FlowManagerService {
      */
     private FlowNode getFirstNode(List<FlowNode> nodes) {
         for (int i = 0; i < nodes.size(); i++) {
-            if (NodeTypeEnum.start.getKey().equals(nodes.get(i).getNodeType())) {
+            if (NodeType.start.getKey().equals(nodes.get(i).getNodeType())) {
                 return nodes.get(i);
             }
         }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowDefinitionMapper.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowDefinitionMapper.java
index 645c9a23..34ef54f1 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowDefinitionMapper.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowDefinitionMapper.java
@@ -1,8 +1,11 @@
 package com.hh.flow.mapper;
 
 import com.hh.flow.domain.FlowDefinition;
+import com.hh.flow.domain.FlowNode;
 import com.hh.mybatis.mapper.BaseMapper;
 
+import java.io.Serializable;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -15,4 +18,38 @@ public interface FlowDefinitionMapper extends BaseMapper<FlowDefinition> {
     List<FlowDefinition> queryByCodeList(List<String> flowCodeList);
 
     void closeFlowByCodeList(List<String> flowCodeList);
+
+    /**
+     * 批量删除流程结点
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFlowNodeByDefinitionIds(Collection<? extends Serializable> ids);
+
+    /**
+     * 通过流程定义主键删除流程结点信息
+     *
+     * @param id 流程定义ID
+     * @return 结果
+     */
+    public int deleteFlowNodeByDefinitionId(Serializable id);
+
+    /**
+     * 批量删除结点跳转关联
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFlowSkipByDefinitionIds(Collection<? extends Serializable> ids);
+
+
+    /**
+     * 通过流程定义主键删除结点跳转关联信息
+     *
+     * @param id 流程定义ID
+     * @return 结果
+     */
+    public int deleteFlowSkipByDefinitionId(Serializable id);
+
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowNodeMapper.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowNodeMapper.java
index 94085ed5..6de52826 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowNodeMapper.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowNodeMapper.java
@@ -20,9 +20,9 @@ public interface FlowNodeMapper extends BaseMapper<FlowNode> {
     List<FlowNode> queryFlowNodeByFlowCodeAndVersion(@NotBlank String flowCode, @NotBlank String version);
 
     /**
-     * 根据ids批量删除
+     * 根据definitionId删除
      *
-     * @param definitionId 需要删除的数据主键集合
+     * @param definitionId 需要删除的definitionId
      * @return 结果
      */
     int deleteByDefinitionId(Long definitionId);
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowSkipMapper.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowSkipMapper.java
index 5d52a3a1..8f6a1616 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowSkipMapper.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowSkipMapper.java
@@ -11,4 +11,11 @@ import com.hh.mybatis.mapper.BaseMapper;
  */
 public interface FlowSkipMapper extends BaseMapper<FlowSkip> {
 
+    /**
+     * 根据nodeId删除
+     *
+     * @param nodeId 需要删除的nodeId
+     * @return 结果
+     */
+    int deleteByNodeId(Long nodeId);
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
index dd9c1701..6714548c 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
@@ -2,7 +2,9 @@ package com.hh.flow.service;
 
 import com.hh.flow.domain.FlowDefinition;
 import com.hh.flow.domain.FlowNode;
+import com.hh.flow.domain.FlowSkip;
 import com.hh.mybatis.service.IBaseService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -18,10 +20,37 @@ public interface IFlowDefinitionService extends IBaseService<FlowDefinition> {
 
     void closeFlowByCodeList(List<String> flowCodeList);
 
+    /**
+     * 查询流程节点列表
+     * @param definitionId
+     * @return
+     */
+    List<FlowNode> getNodeList(Long definitionId);
+
     /**
      * 保存流程结点
      * @param flowNodeList
      * @param definitionId
      */
     void saveNode(@RequestBody List<FlowNode> flowNodeList, Long definitionId);
+
+    /**
+     * 保存流程跳转
+     * @param skipList
+     * @param nodeId
+     */
+    void saveSkip(List<FlowSkip> skipList, Long nodeId);
+
+    /**
+     * 删除流程定义
+     * @param ids
+     */
+    int remove(List<Long> ids);
+
+    /**
+     * 发布流程定义
+     * @param id
+     * @return
+     */
+    int publish(Long id);
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowNodeService.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowNodeService.java
index b81ad5a7..5fd1dcc4 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowNodeService.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowNodeService.java
@@ -33,9 +33,9 @@ public interface IFlowNodeService extends IBaseService<FlowNode> {
     List<FlowNode> queryFlowNodeByFlowCodeAndVersion(@NotBlank String flowCode, @NotBlank String version);
 
     /**
-     * 根据definitionId批量删除
+     * 根据definitionId删除
      *
-     * @param definitionId 需要删除的数据集合
+     * @param definitionId 需要删除的definitionId
      * @return 结果
      */
     int deleteByDefinitionId(Long definitionId);
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowSkipService.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowSkipService.java
index f6978243..b4131046 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowSkipService.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowSkipService.java
@@ -2,6 +2,9 @@ package com.hh.flow.service;
 
 import com.hh.flow.domain.FlowSkip;
 import com.hh.mybatis.service.IBaseService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 结点跳转关联Service接口
@@ -11,4 +14,11 @@ import com.hh.mybatis.service.IBaseService;
  */
 public interface IFlowSkipService extends IBaseService<FlowSkip> {
 
+    /**
+     * 根据nodeId删除
+     *
+     * @param nodeId 需要删除的nodeId
+     * @return 结果
+     */
+    int deleteByNodeId(Long nodeId);
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
index 15f35d8a..742da8a2 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
@@ -1,20 +1,25 @@
 package com.hh.flow.service.impl;
 
+import com.hh.common.exception.ServiceException;
 import com.hh.common.utils.AssertUtil;
+import com.hh.common.utils.StringUtils;
+import com.hh.flow.constant.FlowConstant;
 import com.hh.flow.domain.FlowDefinition;
 import com.hh.flow.domain.FlowNode;
-import com.hh.flow.enums.NodeTypeEnum;
+import com.hh.flow.domain.FlowSkip;
+import com.hh.flow.enums.NodeType;
+import com.hh.flow.enums.PublishStatus;
 import com.hh.flow.mapper.FlowDefinitionMapper;
 import com.hh.flow.service.IFlowDefinitionService;
 import com.hh.flow.service.IFlowNodeService;
-import com.hh.mybatis.domain.R;
+import com.hh.flow.service.IFlowSkipService;
 import com.hh.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -31,6 +36,9 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
     @Resource
     private IFlowNodeService nodeService;
 
+    @Resource
+    private IFlowSkipService skipService;
+
     @Override
     public FlowDefinitionMapper getBaseMapper() {
         return definitionMapper;
@@ -46,14 +54,41 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
         definitionMapper.closeFlowByCodeList(flowCodeList);
     }
 
+    @Override
+    public List<FlowNode> getNodeList(Long definitionId)
+    {
+        FlowNode flowNode = new FlowNode();
+        flowNode.setDefinitionId(definitionId);
+        List<FlowNode> flowNodes = nodeService.selectList(flowNode);
+        StringBuffer skipDescribe;
+        Map<String, String> nodeMap = flowNodes.stream().collect(Collectors.toMap(FlowNode::getNodeCode, FlowNode::getNodeName));
+        for (FlowNode node : flowNodes) {
+            skipDescribe = new StringBuffer();
+            FlowSkip skip = new FlowSkip();
+            skip.setNodeId(node.getId());
+            List<FlowSkip> skips = skipService.selectList(skip);
+            for (FlowSkip flowSkip : skips) {
+                skipDescribe.append("【").append(flowSkip.getConditionValue()).append("】").append("后跳转到").append("【")
+                        .append(nodeMap.get(flowSkip.getNextNodeCode())).append("】;  ");
+            }
+            if (StringUtils.isEmpty(skipDescribe.toString())) {
+                node.setSkipDescribe("无");
+            } else {
+                node.setSkipDescribe(skipDescribe.toString());
+            }
+        }
+
+        return flowNodes;
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveNode(@RequestBody List<FlowNode> flowNodeList, Long definitionId)
     {
+        // TODO min 需要关联skip，最好区间删除、新增、更新类型
         List<Integer> nodeTypes = flowNodeList.stream().map(FlowNode::getNodeType).collect(Collectors.toList());
-        AssertUtil.isTrue(nodeTypes.contains(NodeTypeEnum.start.getKey())
-                && nodeTypes.contains(NodeTypeEnum.end.getKey()), "必须有开始结点和结束结点");
+        AssertUtil.isFalse(nodeTypes.contains(NodeType.start.getKey())
+                && nodeTypes.contains(NodeType.end.getKey()), "必须有开始结点和结束结点");
         FlowDefinition flowDefinition = selectById(definitionId);
         nodeService.deleteByDefinitionId(definitionId);
         for (FlowNode flowNode : flowNodeList) {
@@ -62,4 +97,72 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
         }
         nodeService.batchInsert(flowNodeList);
     }
+
+    /**
+     * 保存流程跳转
+     * @param skipList
+     * @param nodeId
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveSkip(List<FlowSkip> skipList, Long nodeId)
+    {
+        FlowNode node = nodeService.selectById(nodeId);
+        //跳转条件的集合
+        Set<String> conditionSet = new HashSet<>();
+        //目标结点的集合 这两个集合都不能重复
+        Set<String> targetSet = new HashSet<>();
+        //遍历结点下的跳转条件
+        for (int i = 0; i < skipList.size(); i++) {
+            FlowSkip skip = skipList.get(i);
+            //目标结点
+            String target = skip.getNextNodeCode();
+            AssertUtil.isBlank(target, FlowConstant.LOST_DEST_NODE);
+            AssertUtil.isTrue(targetSet.contains(target), FlowConstant.SAME_DEST_NODE);
+            targetSet.add(target);
+            String value = skip.getConditionValue();
+            AssertUtil.isTrue(conditionSet.contains(value), FlowConstant.SAME_CONDITION_VALUE);
+            conditionSet.add(value);
+
+            skip.setNodeId(node.getId());
+            skip.setDefinitionId(node.getDefinitionId());
+            skip.setNowNodeCode(node.getNodeCode());
+        }
+        skipService.deleteByNodeId(nodeId);
+        skipService.batchInsert(skipList);
+    }
+
+
+    /**
+     * 删除流程定义
+     * @param ids
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int remove(List<Long> ids)
+    {
+        definitionMapper.deleteFlowNodeByDefinitionIds(ids);
+        definitionMapper.deleteFlowSkipByDefinitionIds(ids);
+        return deleteByIds(ids);
+    }
+
+    @Override
+    public int publish(Long id)
+    {
+        FlowDefinition definition = selectById(id);
+        List<String> flowCodeList = Arrays.asList(definition.getFlowCode());
+        List<FlowDefinition> flowDefinitions = queryByCodeList(flowCodeList);
+        for (FlowDefinition beforeDefinition : flowDefinitions) {
+            if (definition.getFlowCode().equals(beforeDefinition.getFlowCode()) && definition.getVersion().equals(beforeDefinition.getVersion())) {
+                throw new ServiceException(definition.getFlowCode() + "(" + definition.getVersion() + ")" + FlowConstant.ALREADY_EXIST);
+            }
+        }
+        // 把之前的流程定义改为已失效
+        closeFlowByCodeList(flowCodeList);
+
+        FlowDefinition flowDefinition = new FlowDefinition();
+        flowDefinition.setId(id);
+        flowDefinition.setIsPublish(PublishStatus.PUBLISHED.getKey());
+        return update(flowDefinition);
+    }
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowInstanceServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowInstanceServiceImpl.java
index f1edd36c..d31c3313 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowInstanceServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowInstanceServiceImpl.java
@@ -29,9 +29,9 @@ public class FlowInstanceServiceImpl extends BaseServiceImpl<FlowInstance> imple
 
     @Override
     public List<FlowInstance> queryByidWithUpdateLock(List<Long> definitionIds) {
-        AssertUtil.isFalse(definitionIds == null || definitionIds.size() == 0, FlowConstant.NOT_FOUNT_FLOW);
+        AssertUtil.isTrue(definitionIds == null || definitionIds.size() == 0, FlowConstant.NOT_FOUNT_FLOW);
         for (int i = 0; i < definitionIds.size(); i++) {
-            AssertUtil.notNull(definitionIds.get(i), "流程定义id不能为空!");
+            AssertUtil.isNull(definitionIds.get(i), "流程定义id不能为空!");
         }
         return instanceMapper.queryByidWithUpdateLock(definitionIds);
     }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowSkipServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowSkipServiceImpl.java
index 0260de24..65c558ac 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowSkipServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowSkipServiceImpl.java
@@ -1,12 +1,25 @@
 package com.hh.flow.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import com.hh.common.exception.ServiceException;
+import com.hh.common.utils.AssertUtil;
+import com.hh.common.utils.uuid.IdUtils;
+import com.hh.flow.constant.FlowConstant;
+import com.hh.flow.domain.FlowNode;
 import com.hh.flow.domain.FlowSkip;
 import com.hh.flow.mapper.FlowSkipMapper;
+import com.hh.flow.service.IFlowNodeService;
 import com.hh.flow.service.IFlowSkipService;
+import com.hh.mybatis.domain.R;
 import com.hh.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 结点跳转关联Service业务层处理
@@ -23,4 +36,9 @@ public class FlowSkipServiceImpl extends BaseServiceImpl<FlowSkip> implements IF
     public FlowSkipMapper getBaseMapper() {
         return flowSkipMapper;
     }
+
+    @Override
+    public int deleteByNodeId(Long nodeId) {
+        return flowSkipMapper.deleteByNodeId(nodeId);
+    }
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/utils/FlowConfigUtil.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/utils/FlowConfigUtil.java
index 68a61ae5..146d530b 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/utils/FlowConfigUtil.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/utils/FlowConfigUtil.java
@@ -6,7 +6,7 @@ import com.hh.flow.constant.FlowConstant;
 import com.hh.flow.domain.FlowDefinition;
 import com.hh.flow.domain.FlowNode;
 import com.hh.flow.domain.FlowSkip;
-import com.hh.flow.enums.NodeTypeEnum;
+import com.hh.flow.enums.NodeType;
 import com.hh.flow.vo.FlowCombine;
 import org.springframework.util.CollectionUtils;
 
@@ -48,8 +48,8 @@ public class FlowConfigUtil {
         List<FlowSkip> allSkips = combine.getAllSkips();
 
         String flowName = definition.getFlowName();
-        AssertUtil.notBlank(definition.getFlowCode(), "【" + flowName + "】流程flowCode为空!");
-        AssertUtil.notBlank(definition.getVersion(), "【" + flowName + "】流程version为空!");
+        AssertUtil.isBlank(definition.getFlowCode(), "【" + flowName + "】流程flowCode为空!");
+        AssertUtil.isBlank(definition.getVersion(), "【" + flowName + "】流程version为空!");
         Long id = IdUtils.snowflakeId();
         //发布
         definition.setIsPublish(1);
@@ -64,19 +64,19 @@ public class FlowConfigUtil {
         for (FlowNode node : nodeList)
         {
             initNodeAndCondition(node, id, definition.getVersion());
-            if (NodeTypeEnum.start.getKey().equals(node.getNodeType())) {
+            if (NodeType.start.getKey().equals(node.getNodeType())) {
                 startNum++;
-                AssertUtil.isFalse(startNum > 1, "[" + NodeTypeEnum.getValueByKey(node.getNodeType()) + "]" + FlowConstant.MUL_START_NODE);
+                AssertUtil.isTrue(startNum > 1, "[" + NodeType.getValueByKey(node.getNodeType()) + "]" + FlowConstant.MUL_START_NODE);
             }
             //保证不存在重复的nodeCode
-            AssertUtil.isFalse(nodeCodeSet.contains(node.getNodeCode()),
-                    "【" + NodeTypeEnum.getValueByKey(node.getNodeType()) + "】" + FlowConstant.SAME_NODE_CODE);
+            AssertUtil.isTrue(nodeCodeSet.contains(node.getNodeCode()),
+                    "【" + NodeType.getValueByKey(node.getNodeType()) + "】" + FlowConstant.SAME_NODE_CODE);
             nodeCodeSet.add(node.getNodeCode());
             allNodes.add(node);
             allSkips.addAll(node.getSkipList());
         }
 
-        AssertUtil.isFalse(startNum == 0, "[" + flowName + "]" + FlowConstant.LOST_START_NODE);
+        AssertUtil.isTrue(startNum == 0, "[" + flowName + "]" + FlowConstant.LOST_START_NODE);
         //校验所有目标结点是否都存在
         validaIsExistDestNode(allSkips, nodeCodeSet);
         return combine;
@@ -86,14 +86,14 @@ public class FlowConfigUtil {
         FlowDefinition definition = new FlowDefinition();
         definition.setFlowCode("leaveFlow");
         definition.setFlowName("请假流程");
-        definition.setVersion("5.0");
+        definition.setVersion("8.0");
 
         List<FlowNode> nodeList = new ArrayList<>();
         definition.setNodeList(nodeList);
 
         FlowNode start = new FlowNode();
         nodeList.add(start);
-        start.setNodeType(NodeTypeEnum.getKeyByValue("start"));
+        start.setNodeType(NodeType.getKeyByValue("start"));
         start.setNodeCode("1");
         start.setNodeName("待审批");
         List<FlowSkip> startSkipList = new ArrayList<>();
@@ -104,14 +104,14 @@ public class FlowConfigUtil {
 
         FlowNode end = new FlowNode();
         nodeList.add(end);
-        end.setNodeType(NodeTypeEnum.getKeyByValue("end"));
+        end.setNodeType(NodeType.getKeyByValue("end"));
         end.setNodeCode("5");
         end.setNodeName("审批完成");
         end.setSkipList(new ArrayList<>());
 
         FlowNode betweenNode1 = new FlowNode();
         nodeList.add(betweenNode1);
-        betweenNode1.setNodeType(NodeTypeEnum.getKeyByValue("between"));
+        betweenNode1.setNodeType(NodeType.getKeyByValue("between"));
         betweenNode1.setNodeCode("2");
         betweenNode1.setNodeName("组长审批");
         List<FlowSkip> betweenSkipList1 = new ArrayList<>();
@@ -130,7 +130,7 @@ public class FlowConfigUtil {
 
         FlowNode betweenNode2 = new FlowNode();
         nodeList.add(betweenNode2);
-        betweenNode2.setNodeType(NodeTypeEnum.getKeyByValue("between"));
+        betweenNode2.setNodeType(NodeType.getKeyByValue("between"));
         betweenNode2.setNodeCode("3");
         betweenNode2.setNodeName("部门经理审批");
         List<FlowSkip> betweenSkipList2 = new ArrayList<>();
@@ -149,7 +149,7 @@ public class FlowConfigUtil {
 
         FlowNode betweenNode3 = new FlowNode();
         nodeList.add(betweenNode3);
-        betweenNode3.setNodeType(NodeTypeEnum.getKeyByValue("between"));
+        betweenNode3.setNodeType(NodeType.getKeyByValue("between"));
         betweenNode3.setNodeCode("4");
         betweenNode3.setNodeName("hr审批");
         List<FlowSkip> betweenSkipList3 = new ArrayList<>();
@@ -178,7 +178,7 @@ public class FlowConfigUtil {
     private static void validaIsExistDestNode(List<FlowSkip> allSkips, Set<String> nodeCodeSet) {
         for (int i = 0; i < allSkips.size(); i++) {
             String nextNodeCode = allSkips.get(i).getNextNodeCode();
-            AssertUtil.isFalse(!nodeCodeSet.contains(nextNodeCode), "【" + nextNodeCode + "】" + FlowConstant.NULL_NODE_CODE);
+            AssertUtil.isTrue(!nodeCodeSet.contains(nextNodeCode), "【" + nextNodeCode + "】" + FlowConstant.NULL_NODE_CODE);
         }
     }
 
@@ -195,10 +195,10 @@ public class FlowConfigUtil {
         String nodeName = node.getNodeName();
         String nodeCode = node.getNodeCode();
         List<FlowSkip> skipList = node.getSkipList();
-        if (!NodeTypeEnum.end.getKey().equals(node.getNodeType())) {
-            AssertUtil.isFalse(CollectionUtils.isEmpty(skipList), "开始和中间结点必须有<skip>子结点");
+        if (!NodeType.end.getKey().equals(node.getNodeType())) {
+            AssertUtil.isTrue(CollectionUtils.isEmpty(skipList), "开始和中间结点必须有跳转规则");
         }
-        AssertUtil.notBlank(nodeCode, "[" + nodeName + "]" + FlowConstant.LOST_NODE_CODE);
+        AssertUtil.isBlank(nodeCode, "[" + nodeName + "]" + FlowConstant.LOST_NODE_CODE);
 
         node.setId(IdUtils.snowflakeId());
         node.setVersion(version);
@@ -221,11 +221,11 @@ public class FlowConfigUtil {
             skip.setNowNodeCode(nodeCode);
             //目标结点
             String target = skip.getNextNodeCode();
-            AssertUtil.notBlank(target, "【" + nodeName + "】" + FlowConstant.LOST_DEST_NODE);
-            AssertUtil.isFalse(targetSet.contains(target), "[" + nodeName + "]" + FlowConstant.SAME_DEST_NODE);
+            AssertUtil.isBlank(target, "【" + nodeName + "】" + FlowConstant.LOST_DEST_NODE);
+            AssertUtil.isTrue(targetSet.contains(target), "[" + nodeName + "]" + FlowConstant.SAME_DEST_NODE);
             targetSet.add(target);
             String value = skip.getConditionValue();
-            AssertUtil.isFalse(conditionSet.contains(value), "[" + nodeName + "]" + FlowConstant.SAME_CONDITION_VALUE);
+            AssertUtil.isTrue(conditionSet.contains(value), "[" + nodeName + "]" + FlowConstant.SAME_CONDITION_VALUE);
             conditionSet.add(value);
         }
     }
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
index 51093d12..fdad12ad 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
@@ -17,24 +17,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag"    column="del_flag"    />
     </resultMap>
 
-    <resultMap id="FlowDefinitionFlowNodeResult" type="FlowDefinition" extends="FlowDefinitionResult">
-        <collection property="nodeList" notNullColumn="sub_id" javaType="java.util.List" resultMap="FlowNodeResult" />
-    </resultMap>
-
-    <resultMap type="FlowNode" id="FlowNodeResult">
-        <result property="id"    column="sub_id"    />
-        <result property="nodeType"    column="sub_node_type"    />
-        <result property="definitionId"    column="sub_definition_id"    />
-        <result property="nodeName"    column="sub_node_name"    />
-        <result property="nodeCode"    column="sub_node_code"    />
-        <result property="version"    column="sub_version"    />
-        <result property="createBy"    column="sub_create_by"    />
-        <result property="createTime"    column="sub_create_time"    />
-        <result property="updateBy"    column="sub_update_by"    />
-        <result property="updateTime"    column="sub_update_time"    />
-        <result property="delFlag"    column="sub_del_flag"    />
-    </resultMap>
-
     <sql id="selectVo">
         select t.id, t.flow_code, t.flow_name, t.version, t.is_publish, t.create_by, t.create_time,
                t.update_by, t.update_time, t.del_flag from flow_definition t
@@ -50,12 +32,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectById" parameterType="Long" resultMap="FlowDefinitionFlowNodeResult">
-        select a.id, a.flow_code, a.flow_name, a.version, a.is_publish, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag,
-               b.id as sub_id, b.node_type as sub_node_type, b.definition_id as sub_definition_id, b.node_name as sub_node_name, b.node_code as sub_node_code, b.version as sub_version, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.del_flag as sub_del_flag
-        from flow_definition a
-                 left join flow_node b on b.definition_id = a.id
-        where a.id = #{id}
+    <select id="selectById" parameterType="Long" resultMap="FlowDefinitionResult">
+        <include refid="selectVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectByIds" parameterType="Long" resultMap="FlowDefinitionResult">
+        <include refid="selectVo"/>
+        where t.id in
+        <foreach item="id" collection="list" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </select>
 
     <select id="queryByCodeList" resultMap="FlowDefinitionResult" parameterType="java.util.List">
@@ -132,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <delete id="deleteFlowNodeByDefinitionIds" parameterType="Long">
         delete from flow_node where definition_id in
-        <foreach item="definitionId" collection="array" open="(" separator="," close=")">
+        <foreach item="definitionId" collection="list" open="(" separator="," close=")">
             #{definitionId}
         </foreach>
     </delete>
@@ -141,10 +128,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from flow_node where definition_id = #{definitionId}
     </delete>
 
-    <insert id="batchFlowNode">
-        insert into flow_node( id, node_type, definition_id, node_name, node_code, version, create_by, create_time, update_by, update_time, del_flag) values
-        <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.id}, #{item.nodeType}, #{item.definitionId}, #{item.nodeName}, #{item.nodeCode}, #{item.version}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.delFlag})
+    <delete id="deleteFlowSkipByDefinitionIds" parameterType="Long">
+        delete from flow_skip where definition_id in
+        <foreach item="definitionId" collection="list" open="(" separator="," close=")">
+            #{definitionId}
         </foreach>
-    </insert>
+    </delete>
+
+    <delete id="deleteFlowSkipByDefinitionId" parameterType="Long">
+        delete from flow_skip where definition_id = #{definitionId}
+    </delete>
+
 </mapper>
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml
index 35e301c0..b2692bc2 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml
@@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="definitionId"    column="definition_id"    />
         <result property="nodeName"    column="node_name"    />
         <result property="nodeCode"    column="node_code"    />
+        <result property="roleCode"    column="role_code"    />
+        <result property="roleName"    column="role_name"    />
         <result property="version"    column="version"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -19,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectVo">
-        select t.id, t.node_type, t.definition_id, t.node_name, t.node_code, t.version, t.create_by, t.create_time,
+        select t.id, t.node_type, t.definition_id, t.node_name, t.node_code, t.role_code, role_name, t.version, t.create_by, t.create_time,
                t.update_by, t.update_time, t.del_flag from flow_node t
     </sql>
 
@@ -38,6 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nodeCode != null and nodeCode != ''">
                 and t.node_code = #{nodeCode}
             </if>
+            <if test="roleCode != null and roleCode != ''">
+                and t.role_code = #{roleCode}
+            </if>
+            <if test="roleName != null and roleName != ''">
+                and t.role_name like concat('%',#{roleName}, '%')
+            </if>
             <if test="version != null and version != ''">
                 and t.version = #{version}
             </if>
@@ -79,6 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="definitionId != null">definition_id,</if>
             <if test="nodeName != null and nodeName != ''">node_name,</if>
             <if test="nodeCode != null and nodeCode != ''">node_code,</if>
+            <if test="roleCode != null">role_code,</if>
+            <if test="roleName != null">role_name,</if>
             <if test="version != null and version != ''">version,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -92,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="definitionId != null">#{definitionId},</if>
             <if test="nodeName != null and nodeName != ''">#{nodeName},</if>
             <if test="nodeCode != null and nodeCode != ''">#{nodeCode},</if>
+            <if test="roleCode != null">#{roleCode},</if>
+            <if test="roleName != null">#{roleName},</if>
             <if test="version != null and version != ''">#{version},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -108,6 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="definitionId != null">definition_id = #{definitionId},</if>
             <if test="nodeName != null and nodeName != ''">node_name = #{nodeName},</if>
             <if test="nodeCode != null and nodeCode != ''">node_code = #{nodeCode},</if>
+            <if test="roleCode != null">role_code = #{roleCode},</if>
+            <if test="roleName != null">role_name = #{roleName},</if>
             <if test="version != null and version != ''">version = #{version},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml
index 5eaf0bf4..1ce9d90e 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml
@@ -9,8 +9,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="definitionId"    column="definition_id"    />
         <result property="nodeId"    column="node_id"    />
         <result property="nowNodeCode"    column="now_node_code"    />
-        <result property="roleCode"    column="role_code"    />
-        <result property="roleName"    column="role_name"    />
         <result property="nextNodeCode"    column="next_node_code"    />
         <result property="conditionValue"    column="condition_value"    />
         <result property="createBy"    column="create_by"    />
@@ -21,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectVo">
-        select t.id, t.definition_id, t.node_id, t.now_node_code, t.role_code, t.role_name, t.next_node_code, t.condition_value, t.create_by, t.create_time,
+        select t.id, t.definition_id, t.node_id, t.now_node_code, t.next_node_code, t.condition_value, t.create_by, t.create_time,
                t.update_by, t.update_time, t.del_flag from flow_skip t
     </sql>
 
@@ -37,12 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nowNodeCode != null">
                 and t.now_node_code = #{nowNodeCode}
             </if>
-            <if test="roleCode != null and roleCode != ''">
-                and t.role_code = #{roleCode}
-            </if>
-            <if test="roleName != null and roleName != ''">
-                and t.role_name like concat('%',#{roleName}, '%')
-            </if>
             <if test="nextNodeCode != null and nextNodeCode != ''">
                 and t.next_node_code = #{nextNodeCode}
             </if>
@@ -64,8 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="definitionId != null">definition_id,</if>
             <if test="nodeId != null">node_id,</if>
             <if test="nowNodeCode != null and nowNodeCode != ''">now_node_code,</if>
-            <if test="roleCode != null">role_code,</if>
-            <if test="roleName != null">role_name,</if>
             <if test="nextNodeCode != null and nextNodeCode != ''">next_node_code,</if>
             <if test="conditionValue != null">condition_value,</if>
             <if test="createBy != null">create_by,</if>
@@ -79,8 +69,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="definitionId != null">#{definitionId},</if>
             <if test="nodeId != null">#{nodeId},</if>
             <if test="nowNodeCode != null and nowNodeCode != ''">#{nowNodeCode},</if>
-            <if test="roleCode != null">#{roleCode},</if>
-            <if test="roleName != null">#{roleName},</if>
             <if test="nextNodeCode != null and nextNodeCode != ''">#{nextNodeCode},</if>
             <if test="conditionValue != null">#{conditionValue},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -97,8 +85,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="definitionId != null">definition_id = #{definitionId},</if>
             <if test="nodeId != null">node_id = #{nodeId},</if>
             <if test="nowNodeCode != null and nowNodeCode != ''">now_node_code = #{nowNodeCode},</if>
-            <if test="roleCode != null">role_code = #{roleCode},</if>
-            <if test="roleName != null">role_name = #{roleName},</if>
             <if test="nextNodeCode != null and nextNodeCode != ''">next_node_code = #{nextNodeCode},</if>
             <if test="conditionValue != null">condition_value = #{conditionValue},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -120,4 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <delete id="deleteByNodeId" parameterType="Long">
+        delete from flow_skip where node_id = #{nodeId}
+    </delete>
 </mapper>
diff --git a/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh b/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
index cd4a9cc4..9c9e308d 100644
--- a/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
+++ b/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
@@ -70,6 +70,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.${pkColumn.columnName} = ${r"#"}{${pkColumn.javaField}}
 </#if>
     </select>
+	
+    <select id="selectByIds" parameterType="${pkColumn.javaType}" resultMap="<#if table.sub>${ClassName}${subClassName}Result<#else>${ClassName}Result</#if>">
+<#if table.crud || table.tree>
+        <include refid="selectVo"/>
+        where t.${pkColumn.columnName} in
+        <foreach item="${pkColumn.javaField}" collection="list" open="(" separator="," close=")">
+            ${r"#"}{${pkColumn.javaField}}
+        </foreach>
+</#if>
+    </select>
 
     <insert id="insert" parameterType="${ClassName}">
         insert into ${tableName}
diff --git a/hh-ui/src/api/flow/definition.js b/hh-ui/src/api/flow/definition.js
index 38717d03..edf1864c 100644
--- a/hh-ui/src/api/flow/definition.js
+++ b/hh-ui/src/api/flow/definition.js
@@ -43,7 +43,7 @@ export function delDefinition(id) {
   })
 }
 
-// 查询流程定义详细
+// 保存流程结点
 export function saveNode(data, definitionId) {
   return request({
     url: '/flow/definition/saveNode?definitionId=' + definitionId,
@@ -59,3 +59,28 @@ export function getNodeList(definitionId) {
     method: 'get'
   })
 }
+
+// 查询流程跳转详细
+export function getSkipList(nodeId) {
+  return request({
+    url: '/flow/definition/getSkipList/' + nodeId,
+    method: 'get'
+  })
+}
+
+// 保存流程跳转
+export function saveSkip(data, nodeId) {
+  return request({
+    url: '/flow/definition/saveSkip?nodeId=' + nodeId,
+    method: 'post',
+    data: data
+  })
+}
+
+// 发布流程定义
+export function publish(id) {
+  return request({
+    url: '/flow/definition/publish/' + id,
+    method: 'get'
+  })
+}
diff --git a/hh-ui/src/router/index.js b/hh-ui/src/router/index.js
index 3d395c09..b4043c55 100644
--- a/hh-ui/src/router/index.js
+++ b/hh-ui/src/router/index.js
@@ -172,7 +172,7 @@ export const dynamicRoutes = [
         path: 'index/:id(\\d+)',
         component: () => import('@/views/flow/definition/design'),
         name: 'Design',
-        meta: { title: '设计流程', activeMenu: '/flow/definition' }
+        meta: { title: '流程设计', activeMenu: '/flow/definition' }
       }
     ]
   }
diff --git a/hh-ui/src/views/flow/definition/design.vue b/hh-ui/src/views/flow/definition/design.vue
index b3706c74..e3cf68d2 100644
--- a/hh-ui/src/views/flow/definition/design.vue
+++ b/hh-ui/src/views/flow/definition/design.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="app-container">
-  <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-    <el-row :gutter="10" class="mb8">
+  <el-form ref="form" :model="form" :rules="rules" label-width="110px" :disabled="disabled">
+    <el-row :gutter="10" class="mb8" v-if="!disabled">
       <el-col :span="1.5">
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddFlowNode">添加</el-button>
       </el-col>
@@ -10,14 +10,13 @@
       </el-col>
     </el-row>
     <el-table :data="nodeList" :row-class-name="rowFlowNodeIndex"
-              :row-style="{ height:'0px' }"
-              :cell-style="{ padding:'2px' }"
+              :row-style="{ height:'50px' }"
               :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
               stripe max-height="560"
               @selection-change="handleFlowNodeSelectionChange" ref="flowNode">
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="序号" align="center" prop="index" width="50"/>
-      <el-table-column label="结点类型" prop="nodeType" width="150">
+      <el-table-column label="结点类型" prop="nodeType" width="130">
         <template slot-scope="scope">
           <el-select v-model="scope.row.nodeType" placeholder="请选择结点类型">
             <el-option
@@ -29,54 +28,69 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="流程结点名称" prop="nodeName" width="200">
+      <el-table-column label="结点名称" prop="nodeName" width="150">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.nodeName" placeholder="请输入流程结点名称"/>
+          <el-input v-model="scope.row.nodeName"/>
         </template>
       </el-table-column>
-      <el-table-column label="流程结点编码" prop="nodeCode" width="100">
+      <el-table-column label="结点编码" prop="nodeCode" width="100">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.nodeCode" placeholder="请输入流程结点编码"/>
+          <el-input v-model="scope.row.nodeCode"/>
         </template>
       </el-table-column>
-      <el-table-column label="角色编码" prop="roleCode" width="200">
+      <el-table-column label="权限类型" prop="roleCode" width="150">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.roleCode" placeholder="请选择角色编码">
+          <el-select v-model="scope.row.roleCode">
 
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="跳转规则" prop="skipRules" :show-overflow-tooltip="true" >
+      <el-table-column label="权限范围" prop="roleCode" width="200">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.skipRules" :disabled="true" />
+          <el-select v-model="scope.row.roleCode">
+
+          </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="200" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="跳转规则" prop="skipDescribe">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            v-hasPermi="['flow:definition:skip']"
-          >跳转规则配置</el-button>
+          <el-input v-model="scope.row.skipDescribe" :disabled="true" >
+            <template slot="append" v-if="scope.row.id && scope.row.nodeType !== 2">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-setting"
+                @click="skipRules(scope.row.id)"
+                v-hasPermi="['flow:definition:skip']"
+              ></el-button>
+            </template>
+          </el-input>
         </template>
       </el-table-column>
     </el-table>
   </el-form>
   <div slot="footer" class="dialog-footer" style="text-align: center;margin-left:-100px;margin-top:10px;">
-    <el-button type="primary" @click="submitForm">提交</el-button>
+    <el-button type="primary" v-if="!disabled" @click="submitForm">提交</el-button>
   </div>
+  <SkipDialog ref="dialog" @refresh="getList"></SkipDialog>
 </div>
 </template>
 
 <script>
 
 import {getNodeList, saveNode} from "@/api/flow/definition";
+import SkipDialog from "@/views/flow/definition/skipDialog";
 
 export default {
   name: "Design",
   dicts: ['node_type'],
+  components: {
+    SkipDialog
+  },
   data() {
     return {
+      // 是否禁用表单
+      disabled: false,
       // 子表选中数据
       checkedFlowNode: [],
       // 流程结点表格数据
@@ -100,14 +114,21 @@ export default {
   },
   created() {
     this.definitionId = this.$route.params && this.$route.params.id;
+    if (this.$route.query.disabled == 'true') {
+      this.disabled = true
+    }
     if (this.definitionId) {
       // 获取表详细信息
-      getNodeList(this.definitionId).then(res => {
-        this.nodeList = res.data;
-      });
+      this.getList()
     }
   },
   methods: {
+    getList() {
+      // 获取表详细信息
+      getNodeList(this.definitionId).then(res => {
+        this.nodeList = res.data;
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -115,6 +136,7 @@ export default {
           this.form.nodeList = this.nodeList;
           saveNode(this.form.nodeList, this.definitionId).then(response => {
             this.$modal.msgSuccess("保存成功");
+            this.getList()
           });
         }
       });
@@ -147,6 +169,10 @@ export default {
     handleFlowNodeSelectionChange(selection) {
       this.checkedFlowNode = selection.map(item => item.index)
     },
+
+    skipRules(id) {
+      this.$refs.dialog.show(id);
+    }
   },
 }
 </script>
diff --git a/hh-ui/src/views/flow/definition/index.vue b/hh-ui/src/views/flow/definition/index.vue
index ce2a7c43..9f7a6b1e 100644
--- a/hh-ui/src/views/flow/definition/index.vue
+++ b/hh-ui/src/views/flow/definition/index.vue
@@ -42,28 +42,6 @@
           v-hasPermi="['flow:definition:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['flow:definition:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['flow:definition:remove']"
-        >删除</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -93,9 +71,24 @@
           <el-button
             size="mini"
             type="text"
+            v-if="scope.row.isPublish !== 0"
+            @click="handleQueryDesign(scope.row.id)"
+            v-hasPermi="['flow:definition:queryDesign']"
+          >查看流程设计</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.isPublish === 0"
             @click="handleDesign(scope.row.id)"
             v-hasPermi="['flow:definition:design']"
-          >设计流程</el-button>
+          >流程设计</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.isPublish === 0"
+            @click="handlePublish(scope.row.id)"
+            v-hasPermi="['flow:definition:publish']"
+          >发布</el-button>
           <el-button
             size="mini"
             type="text"
@@ -126,7 +119,7 @@
 </template>
 
 <script>
-import { listDefinition, delDefinition } from "@/api/flow/definition";
+import {listDefinition, delDefinition, publish} from "@/api/flow/definition";
 import Dialog from "@/views/flow/definition/dialog";
 
 export default {
@@ -194,14 +187,34 @@ export default {
     handleAdd() {
       this.$refs.dialog.show();
     },
-    /** 详情按钮操作 */
+
+    /** 流程设计按钮操作 */
+    handleQueryDesign(id) {
+      const params = { disabled: true };
+      this.$tab.openPage("流程设计", '/flow/flow-design/index/' + id, params);
+    },
+
+    /** 流程设计按钮操作 */
     handleDesign(id) {
-      this.$tab.openPage("设计流程", '/flow/flow-design/index/' + id);
+      const params = { disabled: false };
+      this.$tab.openPage("流程设计", '/flow/flow-design/index/' + id, params);
     },
+
+    /** 发布按钮操作 */
+    handlePublish(id) {
+      this.$modal.confirm('是否确认发布流程定义编号为"' + id + '"的数据项？').then(function() {
+        return publish(id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("发布成功");
+      }).catch(() => {});
+    },
+
     /** 修改按钮操作 */
     handleUpdate(id) {
       this.$refs.dialog.show(id);
     },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
diff --git a/hh-ui/src/views/flow/definition/skipDialog.vue b/hh-ui/src/views/flow/definition/skipDialog.vue
new file mode 100644
index 00000000..eef3292b
--- /dev/null
+++ b/hh-ui/src/views/flow/definition/skipDialog.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="app-container">
+    <!-- 添加或修改流程结点对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" v-if="open" append-to-body>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddFlowSkip">添加</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteFlowSkip">删除</el-button>
+        </el-col>
+      </el-row>
+      <el-table :data="skipList" :row-class-name="rowFlowSkipIndex" @selection-change="handleFlowSkipSelectionChange" ref="flowSkip">
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="序号" align="center" prop="index" width="50"/>
+        <el-table-column label="下一个流程结点的编码" prop="nextNodeCode">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.nextNodeCode" placeholder="请输入下一个流程结点的编码"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="跳转条件" prop="conditionValue">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.conditionValue" placeholder="请输入跳转条件"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" >取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {getSkipList, saveSkip} from "@/api/flow/definition";
+
+export default {
+  name: "SkipDialog",
+  data() {
+    return {
+      // 子表选中数据
+      checkedFlowSkip: [],
+      // 结点跳转关联表格数据
+      skipList: [],
+      // 弹出层标题
+      title: "",
+      nodeId: null,
+      // 是否显示弹出层
+      open: false,
+    };
+  },
+  methods: {
+    /** 打开流程结点弹框 */
+    show(id) {
+      this.reset();
+      this.nodeId = id
+      getSkipList(id).then(response => {
+        this.skipList = response.data;
+        this.title = "跳转规则设置";
+        this.open = true;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.skipList = [];
+    },
+    /** 提交按钮 */
+    submitForm() {
+      saveSkip(this.skipList, this.nodeId).then(response => {
+        this.$modal.msgSuccess("保存成功");
+        this.open = false;
+        this.$emit('refresh');
+      });
+    },
+    /** 结点跳转关联序号 */
+    rowFlowSkipIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 结点跳转关联添加按钮操作 */
+    handleAddFlowSkip() {
+      let obj = {};
+      obj.definitionId = "";
+      obj.nowNodeCode = "";
+      obj.nextNodeCode = "";
+      obj.conditionValue = "";
+      this.skipList.push(obj);
+    },
+    /** 结点跳转关联删除按钮操作 */
+    handleDeleteFlowSkip() {
+      if (this.checkedFlowSkip.length == 0) {
+        this.$modal.msgError("请先选择要删除的结点跳转关联数据");
+      } else {
+        const skipList = this.skipList;
+        const checkedFlowSkip = this.checkedFlowSkip;
+        this.skipList = skipList.filter(function(item) {
+          return checkedFlowSkip.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handleFlowSkipSelectionChange(selection) {
+      this.checkedFlowSkip = selection.map(item => item.index)
+    },
+  }
+};
+</script>
+
-- 
Gitee


From 49ea063b5c8fa6fdb816fce2d45a62c58a7964bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E6=9F=B3=E5=8D=8E?= <290631660@qq.com>
Date: Sat, 15 Apr 2023 00:40:47 +0800
Subject: [PATCH 5/6] =?UTF-8?q?[update]=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=EF=BC=9B=E9=A1=B5=E9=9D=A2=E9=85=8D=E7=BD=AE=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hh/test/service/impl/FlowTest.java    |  2 +-
 .../hh/mybatis/controller/BaseController.java |  4 +-
 .../com/hh/mybatis/service/IBaseService.java  | 10 +++
 .../mybatis/service/impl/BaseServiceImpl.java | 40 +++++++++
 .../com/hh/flow/constant/FlowConstant.java    |  3 +
 .../controller/FlowDefinitionController.java  | 11 +++
 .../java/com/hh/flow/domain/FlowNode.java     |  2 +
 .../flow/facade/FlowManagerServiceImpl.java   |  9 +-
 .../com/hh/flow/mapper/FlowSkipMapper.java    | 10 +++
 .../flow/service/IFlowDefinitionService.java  | 14 ++++
 .../com/hh/flow/service/IFlowSkipService.java |  8 ++
 .../impl/FlowDefinitionServiceImpl.java       | 82 +++++++++++++++++--
 .../service/impl/FlowSkipServiceImpl.java     | 12 +++
 .../mapper/flow/FlowDefinitionMapper.xml      |  1 -
 .../resources/mapper/flow/FlowSkipMapper.xml  |  7 ++
 hh-ui/src/api/flow/definition.js              |  8 ++
 hh-ui/src/views/flow/definition/index.vue     | 19 ++++-
 17 files changed, 227 insertions(+), 15 deletions(-)

diff --git a/hh-admin/src/test/java/com/hh/test/service/impl/FlowTest.java b/hh-admin/src/test/java/com/hh/test/service/impl/FlowTest.java
index 1df8fc4b..25fd74d8 100644
--- a/hh-admin/src/test/java/com/hh/test/service/impl/FlowTest.java
+++ b/hh-admin/src/test/java/com/hh/test/service/impl/FlowTest.java
@@ -46,7 +46,7 @@ public class FlowTest {
     public void skipFlow() throws Exception {
         // flowManagerService.skipFlow(1642241652926058496L, "驳回", getUser());
         // flowManagerService.skipFlow(1642241652926058496L, null, getUser());
-        flowManagerService.skipFlow(1643082052721053696L, "审批通过", getUser());
+        flowManagerService.skipFlow(1646900555861331968L, "审批通过", getUser());
         // flowManagerService.skipFlow(1643081321913913344L, "审批通过", getUser());
         // flowManagerService.skipFlow(1643081321913913344L, "审批通过", getUser());
         // flowManagerService.skipFlow(1641692115014651904L, "审批通过", getUser());
diff --git a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/controller/BaseController.java b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/controller/BaseController.java
index df6a3ecc..8486aff3 100644
--- a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/controller/BaseController.java
+++ b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/controller/BaseController.java
@@ -77,7 +77,7 @@ public class BaseController<T extends BaseEntity>
     public R baseAdd(T entity)
     {
         try {
-            return toR(getBaseService().insert(entity));
+            return toR(getBaseService().save(entity));
         } catch (Exception e) {
             String msg = MessageUtils.message("controller.add");
             logger.error(msg, e);
@@ -88,7 +88,7 @@ public class BaseController<T extends BaseEntity>
     public R baseEit(T entity)
     {
         try {
-            return toR(getBaseService().update(entity));
+            return toR(getBaseService().edit(entity));
         } catch (Exception e) {
             String msg = MessageUtils.message("controller.update");
             logger.error(msg, e);
diff --git a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java
index acf5d500..d5453791 100644
--- a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java
+++ b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java
@@ -54,6 +54,8 @@ public interface IBaseService<T extends BaseEntity>
      */
     int insert(T entity);
 
+    int save(T entity);
+
     /**
      * 修改
      *
@@ -62,6 +64,14 @@ public interface IBaseService<T extends BaseEntity>
      */
     int update(T entity);
 
+    /**
+     * 先校验后修改
+     *
+     * @param entity 实体
+     * @return 结果
+     */
+    int edit(T entity);
+
     /**
      * 根据id删除
      *
diff --git a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java
index 28a43ec7..32c89cf1 100644
--- a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java
+++ b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java
@@ -104,6 +104,28 @@ public abstract class BaseServiceImpl<T extends BaseEntity> implements IBaseServ
         return getBaseMapper().insert(entity);
     }
 
+    /**
+     * 先校验后修改
+     *
+     * @param entity 实体
+     * @return 结果
+     */
+    @Override
+    public int save(T entity) {
+
+        checkSave(entity);
+        return insert(entity);
+    }
+
+    /**
+     * 新增前校验
+     * @param entity
+     */
+    protected void checkSave(T entity)
+    {
+
+    }
+
     /**
      * 修改
      *
@@ -119,6 +141,24 @@ public abstract class BaseServiceImpl<T extends BaseEntity> implements IBaseServ
         return getBaseMapper().update(entity);
     }
 
+    /**
+     * 先校验后修改
+     *
+     * @param entity 实体
+     * @return 结果
+     */
+    @Override
+    public int edit(T entity)
+    {
+        checkEdit(entity);
+        return update(entity);
+    }
+
+    public void checkEdit(T entity)
+    {
+
+    }
+
     /**
      * 根据id删除
      *
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/constant/FlowConstant.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/constant/FlowConstant.java
index 47309a09..c78c26ed 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/constant/FlowConstant.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/constant/FlowConstant.java
@@ -33,6 +33,7 @@ public class FlowConstant {
     public static final String NULL_DEST_NODE = "无法跳转到结点,请检查跳转条件和当前角色是否匹配!";
 
     public static final String NULL_CONDITIONVALUE_NODE = "无法跳转到结点,请检查跳转条件是否匹配!";
+
     public static final String NULL_ROLE_NODE = "无法跳转到结点,请检查当前角色是否匹配!";
 
     public static final String MEANINGLESS_CONDITION = "开始结点不需要设置跳转条件和角色!";
@@ -61,6 +62,8 @@ public class FlowConstant {
 
     public static final String NOT_NODE_DATA = "流程结点数据缺失!";
 
+    public static final String NOT_PUBLISH_NODE = "不存在已发布的流程定义!";
+
     public static final String NOT_FOUNT_HIS = "实例历史记录缺失!";
 
     public static final String MSG_OVER_LENGTH = "意见长度过长!";
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java
index 696224df..e96bf5f9 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/controller/FlowDefinitionController.java
@@ -113,6 +113,17 @@ public class FlowDefinitionController extends BaseController<FlowDefinition>
         return toR(definitionService.publish(id));
     }
 
+    /**
+     * 取消发布流程定义
+     */
+    @PreAuthorize("@ss.hasPermi('flow:definition:publish')")
+    @Log(title = "流程定义", businessType = BusinessType.INSERT)
+    @GetMapping("/unPublish/{id}")
+    public R unPublish(@PathVariable("id") Long id)
+    {
+        return toR(definitionService.unPublish(id));
+    }
+
     /**
      * 保存流程结点
      */
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowNode.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowNode.java
index 4f6d876b..74ae3f62 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowNode.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/domain/FlowNode.java
@@ -4,6 +4,7 @@ import com.hh.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,6 +34,7 @@ public class FlowNode extends BaseEntity {
     /**
      * 流程结点编码   每个流程的nodeCode是唯一的,即definitionId+nodeCode唯一,在数据库层面做了控制
      */
+    @NotBlank(message = "流程结点编码不能为空")
     private String nodeCode;
 
     /**
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/facade/FlowManagerServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/facade/FlowManagerServiceImpl.java
index 12204517..da795375 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/facade/FlowManagerServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/facade/FlowManagerServiceImpl.java
@@ -1,5 +1,6 @@
 package com.hh.flow.facade;
 
+import cn.hutool.core.collection.CollUtil;
 import com.hh.common.exception.ServiceException;
 import com.hh.common.utils.AssertUtil;
 import com.hh.common.utils.uuid.IdUtils;
@@ -12,6 +13,7 @@ import com.hh.flow.vo.FlowCombine;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -63,6 +65,7 @@ public class FlowManagerServiceImpl implements FlowManagerService {
         AssertUtil.isBlank(businessId, FlowConstant.NULL_BUSINESS_ID);
         // 根据流程编码获取开启的唯一流程的流程结点集合
         List<FlowNode> nodes = nodeService.queryNewVersionFlowNodeByFlowCode(flowUser.getFlowCode());
+        AssertUtil.isTrue(nodes.size() == 0, FlowConstant.NOT_PUBLISH_NODE);
         // 获取开始结点
         FlowNode startNode = getFirstNode(nodes);
         return startFlow(startNode, Arrays.asList(businessId), flowUser).get(0);
@@ -76,6 +79,7 @@ public class FlowManagerServiceImpl implements FlowManagerService {
         AssertUtil.isTrue(businessIds == null || businessIds.size() == 0, FlowConstant.NULL_BUSINESS_ID);
         // 根据流程编码获取开启的唯一流程的流程结点集合
         List<FlowNode> nodes = nodeService.queryNewVersionFlowNodeByFlowCode(flowUser.getFlowCode());
+        AssertUtil.isTrue(nodes.size() == 0, FlowConstant.NOT_PUBLISH_NODE);
         // 获取开始结点
         FlowNode startNode = getFirstNode(nodes);
         return startFlow(startNode, businessIds, flowUser);
@@ -90,6 +94,7 @@ public class FlowManagerServiceImpl implements FlowManagerService {
         AssertUtil.isBlank(version, FlowConstant.NULL_FLOW_VERSION);
         // 根据流程编码+版本号确定唯一的流程结点集合
         List<FlowNode> nodes = nodeService.queryFlowNodeByFlowCodeAndVersion(flowUser.getFlowCode(), version);
+        AssertUtil.isTrue(nodes.size() == 0, FlowConstant.NOT_PUBLISH_NODE);
         // 获取开始结点
         FlowNode startNode = getFirstNode(nodes);
         return startFlow(startNode, Arrays.asList(businessId), flowUser).get(0);
@@ -104,6 +109,7 @@ public class FlowManagerServiceImpl implements FlowManagerService {
         AssertUtil.isBlank(version, FlowConstant.NULL_FLOW_VERSION);
         // 根据流程编码+版本号确定唯一的流程结点集合
         List<FlowNode> nodes = nodeService.queryFlowNodeByFlowCodeAndVersion(flowUser.getFlowCode(), version);
+        AssertUtil.isTrue(nodes.size() == 0, FlowConstant.NOT_PUBLISH_NODE);
         // 获取开始结点
         FlowNode startNode = getFirstNode(nodes);
         return startFlow(startNode, businessIds, flowUser);
@@ -322,7 +328,8 @@ public class FlowManagerServiceImpl implements FlowManagerService {
         flowNode.setDefinitionId(instance.getDefinitionId());
         flowNode.setNodeCode(instance.getNodeCode());
         FlowNode node = nodeService.selectOne(flowNode);
-        AssertUtil.isFalse(roleKeys.contains(node.getRoleCode()), FlowConstant.NULL_ROLE_NODE);
+        AssertUtil.isTrue(StringUtils.isNotBlank(node.getRoleCode()) && (CollUtil.isEmpty(roleKeys)
+                || !roleKeys.contains(node.getRoleCode())), FlowConstant.NULL_ROLE_NODE);
 
         // 第一个结点不需要过滤
         if (!NodeType.start.getKey().equals(instance.getFlowStatus())) {
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowSkipMapper.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowSkipMapper.java
index 8f6a1616..de990175 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowSkipMapper.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/mapper/FlowSkipMapper.java
@@ -3,6 +3,8 @@ package com.hh.flow.mapper;
 import com.hh.flow.domain.FlowSkip;
 import com.hh.mybatis.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 结点跳转关联Mapper接口
  *
@@ -18,4 +20,12 @@ public interface FlowSkipMapper extends BaseMapper<FlowSkip> {
      * @return 结果
      */
     int deleteByNodeId(Long nodeId);
+
+    /**
+     * 根据nodeIds删除
+     *
+     * @param nodeIds 需要删除的nodeIds
+     * @return 结果
+     */
+    int deleteByNodeIds(List<Long> nodeIds);
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
index 6714548c..6f4e06a6 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
@@ -20,6 +20,13 @@ public interface IFlowDefinitionService extends IBaseService<FlowDefinition> {
 
     void closeFlowByCodeList(List<String> flowCodeList);
 
+    /**
+     * 保存流程定义
+     * @param flowDefinition
+     * @return
+     */
+    int save(FlowDefinition flowDefinition);
+
     /**
      * 查询流程节点列表
      * @param definitionId
@@ -53,4 +60,11 @@ public interface IFlowDefinitionService extends IBaseService<FlowDefinition> {
      * @return
      */
     int publish(Long id);
+
+    /**
+     * 取消发布流程定义
+     * @param id
+     * @return
+     */
+    int unPublish(Long id);
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowSkipService.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowSkipService.java
index b4131046..72c6cb25 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowSkipService.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowSkipService.java
@@ -21,4 +21,12 @@ public interface IFlowSkipService extends IBaseService<FlowSkip> {
      * @return 结果
      */
     int deleteByNodeId(Long nodeId);
+
+    /**
+     * 根据nodeIds删除
+     *
+     * @param nodeIds 需要删除的nodeIds
+     * @return 结果
+     */
+    int deleteByNodeIds(List<Long> nodeIds);
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
index 742da8a2..2b59a48c 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
@@ -1,8 +1,11 @@
 package com.hh.flow.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.hh.common.exception.ServiceException;
 import com.hh.common.utils.AssertUtil;
 import com.hh.common.utils.StringUtils;
+import com.hh.common.utils.spring.SpringUtils;
 import com.hh.flow.constant.FlowConstant;
 import com.hh.flow.domain.FlowDefinition;
 import com.hh.flow.domain.FlowNode;
@@ -13,6 +16,7 @@ import com.hh.flow.mapper.FlowDefinitionMapper;
 import com.hh.flow.service.IFlowDefinitionService;
 import com.hh.flow.service.IFlowNodeService;
 import com.hh.flow.service.IFlowSkipService;
+import com.hh.mybatis.handler.DataFillHandler;
 import com.hh.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,6 +58,18 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
         definitionMapper.closeFlowByCodeList(flowCodeList);
     }
 
+    @Override
+    public void checkSave(FlowDefinition flowDefinition)
+    {
+        List<String> flowCodeList = Arrays.asList(flowDefinition.getFlowCode());
+        List<FlowDefinition> flowDefinitions = queryByCodeList(flowCodeList);
+        for (FlowDefinition beforeDefinition : flowDefinitions) {
+            if (flowDefinition.getFlowCode().equals(beforeDefinition.getFlowCode()) && flowDefinition.getVersion().equals(beforeDefinition.getVersion())) {
+                throw new ServiceException(flowDefinition.getFlowCode() + "(" + flowDefinition.getVersion() + ")" + FlowConstant.ALREADY_EXIST);
+            }
+        }
+    }
+
     @Override
     public List<FlowNode> getNodeList(Long definitionId)
     {
@@ -89,13 +105,58 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
         List<Integer> nodeTypes = flowNodeList.stream().map(FlowNode::getNodeType).collect(Collectors.toList());
         AssertUtil.isFalse(nodeTypes.contains(NodeType.start.getKey())
                 && nodeTypes.contains(NodeType.end.getKey()), "必须有开始结点和结束结点");
-        FlowDefinition flowDefinition = selectById(definitionId);
-        nodeService.deleteByDefinitionId(definitionId);
+        FlowNode nodeQuery = new FlowNode();
+        nodeQuery.setDefinitionId(definitionId);
+        // 获取原始结点
+        List<FlowNode> flowNodesOrig = nodeService.selectList(nodeQuery);
+
+        Set<Long> origNodeIds = flowNodesOrig.stream().map(FlowNode::getId).collect(Collectors.toSet());
+        Set<Long> tarNodeIds = flowNodeList.stream().map(FlowNode::getId).collect(Collectors.toSet());
+
+        // 新增结点
+        List<FlowNode> nodesAdd = new ArrayList<>();
+        // 更新结点
+        List<FlowNode> nodesUpdate = new ArrayList<>();
         for (FlowNode flowNode : flowNodeList) {
+            if (ObjectUtil.isNull(flowNode.getId())) {
+                nodesAdd.add(flowNode);
+            } else if (origNodeIds.contains(flowNode.getId())) {
+                nodesUpdate.add(flowNode);
+            }
+        }
+
+        // 删除结点
+        List<Long> nodesDelete = new ArrayList<>();
+        for (Long origNodeId : origNodeIds) {
+            if (!tarNodeIds.contains(origNodeId))
+            {
+                nodesDelete.add(origNodeId);
+            }
+        }
+
+        //  执行新增
+        FlowDefinition flowDefinition = selectById(definitionId);
+        for (FlowNode flowNode : nodesAdd) {
             flowNode.setDefinitionId(definitionId);
             flowNode.setVersion(flowDefinition.getVersion());
         }
-        nodeService.batchInsert(flowNodeList);
+
+        if (CollUtil.isNotEmpty(nodesAdd)) {
+            nodeService.batchInsert(nodesAdd);
+        }
+
+        // 执行更新
+        if (CollUtil.isNotEmpty(nodesUpdate)) {
+
+            nodeService.batchUpdate(nodesUpdate);
+        }
+
+        // 执行删除
+        if (CollUtil.isNotEmpty(nodesDelete)) {
+            skipService.deleteByNodeIds(nodesDelete);
+            nodeService.batchDelete(nodesDelete);
+        }
+
     }
 
     /**
@@ -151,12 +212,6 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
     {
         FlowDefinition definition = selectById(id);
         List<String> flowCodeList = Arrays.asList(definition.getFlowCode());
-        List<FlowDefinition> flowDefinitions = queryByCodeList(flowCodeList);
-        for (FlowDefinition beforeDefinition : flowDefinitions) {
-            if (definition.getFlowCode().equals(beforeDefinition.getFlowCode()) && definition.getVersion().equals(beforeDefinition.getVersion())) {
-                throw new ServiceException(definition.getFlowCode() + "(" + definition.getVersion() + ")" + FlowConstant.ALREADY_EXIST);
-            }
-        }
         // 把之前的流程定义改为已失效
         closeFlowByCodeList(flowCodeList);
 
@@ -165,4 +220,13 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
         flowDefinition.setIsPublish(PublishStatus.PUBLISHED.getKey());
         return update(flowDefinition);
     }
+
+    @Override
+    public int unPublish(Long id)
+    {
+        FlowDefinition flowDefinition = new FlowDefinition();
+        flowDefinition.setId(id);
+        flowDefinition.setIsPublish(PublishStatus.UNPUBLISHED.getKey());
+        return update(flowDefinition);
+    }
 }
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowSkipServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowSkipServiceImpl.java
index 65c558ac..ecc6ca84 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowSkipServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowSkipServiceImpl.java
@@ -41,4 +41,16 @@ public class FlowSkipServiceImpl extends BaseServiceImpl<FlowSkip> implements IF
     public int deleteByNodeId(Long nodeId) {
         return flowSkipMapper.deleteByNodeId(nodeId);
     }
+
+    /**
+     * 根据nodeIds删除
+     *
+     * @param nodeIds 需要删除的nodeIds
+     * @return 结果
+     */
+    @Override
+    public int deleteByNodeIds(List<Long> nodeIds)
+    {
+        return flowSkipMapper.deleteByNodeIds(nodeIds);
+    }
 }
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
index fdad12ad..b4d42d5c 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
@@ -51,7 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        and is_publish = 1
     </select>
 
     <insert id="insert" parameterType="FlowDefinition">
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml
index 1ce9d90e..89c35a51 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml
@@ -110,4 +110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteByNodeId" parameterType="Long">
         delete from flow_skip where node_id = #{nodeId}
     </delete>
+
+    <delete id="deleteByNodeIds" parameterType="Long">
+        delete from flow_skip where node_id in
+        <foreach item="item" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
 </mapper>
diff --git a/hh-ui/src/api/flow/definition.js b/hh-ui/src/api/flow/definition.js
index edf1864c..50ae0eb1 100644
--- a/hh-ui/src/api/flow/definition.js
+++ b/hh-ui/src/api/flow/definition.js
@@ -84,3 +84,11 @@ export function publish(id) {
     method: 'get'
   })
 }
+
+// 取消发布流程定义
+export function unPublish(id) {
+  return request({
+    url: '/flow/definition/unPublish/' + id,
+    method: 'get'
+  })
+}
diff --git a/hh-ui/src/views/flow/definition/index.vue b/hh-ui/src/views/flow/definition/index.vue
index 9f7a6b1e..3ed5c8b4 100644
--- a/hh-ui/src/views/flow/definition/index.vue
+++ b/hh-ui/src/views/flow/definition/index.vue
@@ -89,6 +89,13 @@
             @click="handlePublish(scope.row.id)"
             v-hasPermi="['flow:definition:publish']"
           >发布</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.isPublish === 1"
+            @click="handleUpPublish(scope.row.id)"
+            v-hasPermi="['flow:definition:upPublish']"
+          >取消发布</el-button>
           <el-button
             size="mini"
             type="text"
@@ -119,7 +126,7 @@
 </template>
 
 <script>
-import {listDefinition, delDefinition, publish} from "@/api/flow/definition";
+import {listDefinition, delDefinition, publish, unPublish} from "@/api/flow/definition";
 import Dialog from "@/views/flow/definition/dialog";
 
 export default {
@@ -210,6 +217,16 @@ export default {
       }).catch(() => {});
     },
 
+    /** 取消发布按钮操作 */
+    handleUpPublish(id) {
+      this.$modal.confirm('是否确认取消发布流程定义编号为"' + id + '"的数据项？').then(function() {
+        return unPublish(id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("取消成功");
+      }).catch(() => {});
+    },
+
     /** 修改按钮操作 */
     handleUpdate(id) {
       this.$refs.dialog.show(id);
-- 
Gitee


From bbccedf464a089b3e51ae00916f3c37f14b8ed1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E6=9F=B3=E5=8D=8E?= <290631660@qq.com>
Date: Sat, 15 Apr 2023 15:37:35 +0800
Subject: [PATCH 6/6] =?UTF-8?q?[update]=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=EF=BC=9B=E9=A1=B5=E9=9D=A2=E9=85=8D=E7=BD=AE=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TestMaterServiceImpl.java    |  4 +--
 hh-admin/src/main/resources/application.yml   |  1 +
 .../mapper/test/TestCommonMapper.xml          | 25 ++++++++++++++++++-
 .../resources/mapper/test/TestLeaveMapper.xml | 20 ++++++++++++++-
 .../resources/mapper/test/TestMaterMapper.xml | 17 +++++++++++++
 .../resources/mapper/test/TestTreeMapper.xml  | 15 +++++++++++
 .../java/com/hh/test/service/impl/Test.java   | 16 ++----------
 .../com/hh/mybatis/mapper/BaseMapper.java     |  8 ++++++
 .../com/hh/mybatis/service/IBaseService.java  | 15 +++++++++++
 .../mybatis/service/impl/BaseServiceImpl.java | 20 ++++++++++++---
 .../flow/service/IFlowDefinitionService.java  |  7 ------
 .../impl/FlowDefinitionServiceImpl.java       |  6 ++---
 .../mapper/flow/FlowDefinitionMapper.xml      | 17 ++++++++++++-
 .../mapper/flow/FlowInsHisMapper.xml          | 22 +++++++++++++++-
 .../mapper/flow/FlowInstanceMapper.xml        | 20 +++++++++++++++
 .../resources/mapper/flow/FlowNodeMapper.xml  | 20 ++++++++++++++-
 .../resources/mapper/flow/FlowSkipMapper.xml  | 17 +++++++++++++
 .../resources/templates/xml/mapper.xml.ftlh   | 15 +++++++++--
 18 files changed, 228 insertions(+), 37 deletions(-)

diff --git a/hh-admin/src/main/java/com/hh/test/service/impl/TestMaterServiceImpl.java b/hh-admin/src/main/java/com/hh/test/service/impl/TestMaterServiceImpl.java
index 980c4492..0ba64e2d 100644
--- a/hh-admin/src/main/java/com/hh/test/service/impl/TestMaterServiceImpl.java
+++ b/hh-admin/src/main/java/com/hh/test/service/impl/TestMaterServiceImpl.java
@@ -59,11 +59,11 @@ public class TestMaterServiceImpl extends BaseServiceImpl<TestMater> implements
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public int update(TestMater testMater)
+    public int updateById(TestMater testMater)
     {
         testMaterMapper.deleteTestSubByLegalId(testMater.getId());
         insertTestSub(testMater);
-        return super.update(testMater);
+        return super.updateById(testMater);
     }
 
     /**
diff --git a/hh-admin/src/main/resources/application.yml b/hh-admin/src/main/resources/application.yml
index 7fba974b..770d0790 100644
--- a/hh-admin/src/main/resources/application.yml
+++ b/hh-admin/src/main/resources/application.yml
@@ -93,6 +93,7 @@ mybatis:
     # 加载全局的配置文件
     configLocation: classpath:mybatis/mybatis-config.xml
 
+
 # PageHelper分页插件
 pagehelper:
   helperDialect: mysql
diff --git a/hh-admin/src/main/resources/mapper/test/TestCommonMapper.xml b/hh-admin/src/main/resources/mapper/test/TestCommonMapper.xml
index a1c0e74b..fbb3a26f 100644
--- a/hh-admin/src/main/resources/mapper/test/TestCommonMapper.xml
+++ b/hh-admin/src/main/resources/mapper/test/TestCommonMapper.xml
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="update" parameterType="TestCommon">
+    <update id="updateById" parameterType="TestCommon">
         update test_common
         <trim prefix="SET" suffixOverrides=",">
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -120,6 +120,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="update" parameterType="TestCommon">
+        update test_common
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="level != null">level = #{level},</if>
+            <if test="sendDocNo != null">send_doc_no = #{sendDocNo},</if>
+            <if test="sendDocUnit != null">send_doc_unit = #{sendDocUnit},</if>
+            <if test="publishTime != null">publish_time = #{publishTime},</if>
+            <if test="deadline != null">deadline = #{deadline},</if>
+            <if test="label != null">label = #{label},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="money != null">money = #{money},</if>
+            <if test="views != null">views = #{views},</if>
+            <if test="newfileId != null">newfileId = #{newfileId},</if>
+            <if test="imageId != null">imageId = #{imageId},</if>
+        </trim>
+    </update>
+
     <delete id="deleteById" parameterType="Long">
         delete from test_common where id = #{id}
     </delete>
diff --git a/hh-admin/src/main/resources/mapper/test/TestLeaveMapper.xml b/hh-admin/src/main/resources/mapper/test/TestLeaveMapper.xml
index 2af98dc2..dc16935b 100644
--- a/hh-admin/src/main/resources/mapper/test/TestLeaveMapper.xml
+++ b/hh-admin/src/main/resources/mapper/test/TestLeaveMapper.xml
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="update" parameterType="TestLeave">
+    <update id="updateById" parameterType="TestLeave">
         update test_leave
         <trim prefix="SET" suffixOverrides=",">
             <if test="type != null">type = #{type},</if>
@@ -93,6 +93,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="update" parameterType="TestLeave">
+        update test_leave
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="type != null">type = #{type},</if>
+            <if test="reason != null and reason != ''">reason = #{reason},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="day != null">day = #{day},</if>
+            <if test="instanceId != null">instance_id = #{instanceId},</if>
+            <if test="flowStatus != null">flow_status = #{flowStatus},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+    </update>
+
     <delete id="deleteById" parameterType="Long">
         delete from test_leave where id = #{id}
     </delete>
diff --git a/hh-admin/src/main/resources/mapper/test/TestMaterMapper.xml b/hh-admin/src/main/resources/mapper/test/TestMaterMapper.xml
index a367712d..b6e788e1 100644
--- a/hh-admin/src/main/resources/mapper/test/TestMaterMapper.xml
+++ b/hh-admin/src/main/resources/mapper/test/TestMaterMapper.xml
@@ -88,6 +88,23 @@
         </trim>
     </insert>
 
+    <update id="updateById" parameterType="TestMater">
+        update test_mater
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="lawFirmName != null">law_firm_name = #{lawFirmName},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="fileId != null">file_id = #{fileId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="state != null">state = #{state},</if>
+            <if test="publishTime != null">publish_time = #{publishTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <update id="update" parameterType="TestMater">
         update test_mater
         <trim prefix="SET" suffixOverrides=",">
diff --git a/hh-admin/src/main/resources/mapper/test/TestTreeMapper.xml b/hh-admin/src/main/resources/mapper/test/TestTreeMapper.xml
index 3d98c624..f3f41b3a 100644
--- a/hh-admin/src/main/resources/mapper/test/TestTreeMapper.xml
+++ b/hh-admin/src/main/resources/mapper/test/TestTreeMapper.xml
@@ -60,6 +60,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <update id="updateById" parameterType="TestTree">
+        update test_tree
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="treeName != null">tree_name = #{treeName},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <update id="update" parameterType="TestTree">
         update test_tree
         <trim prefix="SET" suffixOverrides=",">
diff --git a/hh-admin/src/test/java/com/hh/test/service/impl/Test.java b/hh-admin/src/test/java/com/hh/test/service/impl/Test.java
index 395483dc..2c2b2529 100644
--- a/hh-admin/src/test/java/com/hh/test/service/impl/Test.java
+++ b/hh-admin/src/test/java/com/hh/test/service/impl/Test.java
@@ -1,5 +1,7 @@
 package com.hh.test.service.impl;
 
+import com.hh.test.domain.TestCommon;
+
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
@@ -9,19 +11,5 @@ public class Test {
     @org.junit.jupiter.api.Test
     public void test1()
     {
-// 1为 int 类型、0代表前面要补位的字符、2代表字符串的长度、d表示参数为整数类型
-        String s = String.format("0.%0" + "2" + "d", 1);
-        System.out.println(s);
-        int a = 20;
-        String bb = String.format("%-" + a + "s", 10).replace(" ", "0");
-        System.out.println(bb);
-        BigDecimal aLong = new BigDecimal(bb);
-        System.out.println(aLong.subtract(new BigDecimal(1)));
-        // BigDecimal pow = BigDecimal.valueOf(Math.pow(10, 18));
-        // int a = 18;
-        // for (int i = 0; i < a; i++) {
-        //
-        // }
-        // System.out.println(pow);
     }
 }
diff --git a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/mapper/BaseMapper.java b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/mapper/BaseMapper.java
index 23c52363..fea9ab68 100644
--- a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/mapper/BaseMapper.java
+++ b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/mapper/BaseMapper.java
@@ -46,6 +46,14 @@ public interface BaseMapper<T extends BaseEntity>
      */
     int insert(T entity);
 
+    /**
+     * 根据id修改
+     *
+     * @param entity 实体
+     * @return 结果
+     */
+    int updateById(T entity);
+
     /**
      * 修改
      *
diff --git a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java
index d5453791..3244c449 100644
--- a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java
+++ b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/IBaseService.java
@@ -1,6 +1,7 @@
 package com.hh.mybatis.service;
 
 import com.hh.common.core.domain.BaseEntity;
+import com.hh.mybatis.mapper.BaseMapper;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -14,6 +15,7 @@ import java.util.List;
  */
 public interface IBaseService<T extends BaseEntity>
 {
+
     /**
      * 根据id查询
      *
@@ -54,8 +56,21 @@ public interface IBaseService<T extends BaseEntity>
      */
     int insert(T entity);
 
+    /**
+     * 新增
+     * @param entity
+     * @return
+     */
     int save(T entity);
 
+    /**
+     * 根据id修改
+     *
+     * @param entity 实体
+     * @return 结果
+     */
+    int updateById(T entity);
+
     /**
      * 修改
      *
diff --git a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java
index 32c89cf1..b2684ba9 100644
--- a/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java
+++ b/hh-framework/hh-mybatis/src/main/java/com/hh/mybatis/service/impl/BaseServiceImpl.java
@@ -84,7 +84,6 @@ public abstract class BaseServiceImpl<T extends BaseEntity> implements IBaseServ
     @Override
     public T selectOne(T entity) {
         List<T> list = getBaseMapper().selectList(entity);
-
         return CollUtil.isEmpty(list) ? null: list.get(0);
     }
 
@@ -126,6 +125,21 @@ public abstract class BaseServiceImpl<T extends BaseEntity> implements IBaseServ
 
     }
 
+    /**
+     * 根据id修改
+     *
+     * @param entity 实体
+     * @return 结果
+     */
+    @Override
+    public int updateById(T entity) {
+        DataFillHandler dataFillHandler = SpringUtils.getBeanNoException(DataFillHandler.class);
+        if (ObjectUtil.isNotNull(dataFillHandler)) {
+            dataFillHandler.updateFill(entity);
+        }
+        return getBaseMapper().updateById(entity);
+    }
+
     /**
      * 修改
      *
@@ -151,7 +165,7 @@ public abstract class BaseServiceImpl<T extends BaseEntity> implements IBaseServ
     public int edit(T entity)
     {
         checkEdit(entity);
-        return update(entity);
+        return updateById(entity);
     }
 
     public void checkEdit(T entity)
@@ -230,7 +244,7 @@ public abstract class BaseServiceImpl<T extends BaseEntity> implements IBaseServ
                 if (ObjectUtil.isNotNull(dataFillHandler)) {
                     dataFillHandler.updateFill(record);
                 }
-                mapper.update(record);
+                mapper.updateById(record);
                 batch++;
                 if (batch == 800) {
                     session.commit();
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
index 6f4e06a6..79db843a 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/IFlowDefinitionService.java
@@ -20,13 +20,6 @@ public interface IFlowDefinitionService extends IBaseService<FlowDefinition> {
 
     void closeFlowByCodeList(List<String> flowCodeList);
 
-    /**
-     * 保存流程定义
-     * @param flowDefinition
-     * @return
-     */
-    int save(FlowDefinition flowDefinition);
-
     /**
      * 查询流程节点列表
      * @param definitionId
diff --git a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
index 2b59a48c..70c508be 100644
--- a/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
+++ b/hh-modules/hh-flow/src/main/java/com/hh/flow/service/impl/FlowDefinitionServiceImpl.java
@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.hh.common.exception.ServiceException;
 import com.hh.common.utils.AssertUtil;
 import com.hh.common.utils.StringUtils;
-import com.hh.common.utils.spring.SpringUtils;
 import com.hh.flow.constant.FlowConstant;
 import com.hh.flow.domain.FlowDefinition;
 import com.hh.flow.domain.FlowNode;
@@ -16,7 +15,6 @@ import com.hh.flow.mapper.FlowDefinitionMapper;
 import com.hh.flow.service.IFlowDefinitionService;
 import com.hh.flow.service.IFlowNodeService;
 import com.hh.flow.service.IFlowSkipService;
-import com.hh.mybatis.handler.DataFillHandler;
 import com.hh.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -218,7 +216,7 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
         FlowDefinition flowDefinition = new FlowDefinition();
         flowDefinition.setId(id);
         flowDefinition.setIsPublish(PublishStatus.PUBLISHED.getKey());
-        return update(flowDefinition);
+        return updateById(flowDefinition);
     }
 
     @Override
@@ -227,6 +225,6 @@ public class FlowDefinitionServiceImpl extends BaseServiceImpl<FlowDefinition> i
         FlowDefinition flowDefinition = new FlowDefinition();
         flowDefinition.setId(id);
         flowDefinition.setIsPublish(PublishStatus.UNPUBLISHED.getKey());
-        return update(flowDefinition);
+        return updateById(flowDefinition);
     }
 }
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
index b4d42d5c..da84b96a 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowDefinitionMapper.xml
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="update" parameterType="FlowDefinition">
+    <update id="updateById" parameterType="FlowDefinition">
         update flow_definition
         <trim prefix="SET" suffixOverrides=",">
             <if test="flowCode != null and flowCode != ''">flow_code = #{flowCode},</if>
@@ -97,6 +97,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="update" parameterType="FlowDefinition">
+        update flow_definition
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="flowCode != null and flowCode != ''">flow_code = #{flowCode},</if>
+            <if test="flowName != null and flowName != ''">flow_name = #{flowName},</if>
+            <if test="version != null and version != ''">version = #{version},</if>
+            <if test="isPublish != null">is_publish = #{isPublish},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+    </update>
+
     <update id="closeFlowByCodeList"  parameterType="java.util.List">
         update flow_definition set is_publish = 9
         where flow_code in
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowInsHisMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowInsHisMapper.xml
index eea14465..96868fe6 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowInsHisMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowInsHisMapper.xml
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="update" parameterType="FlowInsHis">
+    <update id="updateById" parameterType="FlowInsHis">
         update flow_ins_his
         <trim prefix="SET" suffixOverrides=",">
             <if test="nodeFrom != null and nodeFrom != ''">node_from = #{nodeFrom},</if>
@@ -125,6 +125,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="update" parameterType="FlowInsHis">
+        update flow_ins_his
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="nodeFrom != null and nodeFrom != ''">node_from = #{nodeFrom},</if>
+            <if test="nodeFromName != null and nodeFromName != ''">node_from_name = #{nodeFromName},</if>
+            <if test="nodeTo != null and nodeTo != ''">node_to = #{nodeTo},</if>
+            <if test="nodeToName != null and nodeToName != ''">node_to_name = #{nodeToName},</if>
+            <if test="userCode != null and userCode != ''">user_code = #{userCode},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="instanceId != null">instance_id = #{instanceId},</if>
+            <if test="message != null">message = #{message},</if>
+            <if test="conditionValue != null">condition_value = #{conditionValue},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+    </update>
+
     <delete id="deleteById" parameterType="Long">
         delete from flow_ins_his where id = #{id}
     </delete>
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowInstanceMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowInstanceMapper.xml
index ced8bb94..d5c23bad 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowInstanceMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowInstanceMapper.xml
@@ -90,6 +90,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <update id="updateById" parameterType="FlowInstance">
+        update flow_instance
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="businessId != null and businessId != ''">business_id = #{businessId},</if>
+            <if test="nodeCode != null and nodeCode != ''">node_code = #{nodeCode},</if>
+            <if test="nodeName != null and nodeName != ''">node_name = #{nodeName},</if>
+            <if test="flowStatus != null">flow_status = #{flowStatus},</if>
+            <if test="flowVersion != null and flowVersion != ''">flow_version = #{flowVersion},</if>
+            <if test="userCode != null and userCode != ''">user_code = #{userCode},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="definitionId != null">definition_id = #{definitionId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <update id="update" parameterType="FlowInstance">
         update flow_instance
         <trim prefix="SET" suffixOverrides=",">
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml
index b2692bc2..0cdd7423 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowNodeMapper.xml
@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="update" parameterType="FlowNode">
+    <update id="updateById" parameterType="FlowNode">
         update flow_node
         <trim prefix="SET" suffixOverrides=",">
             <if test="nodeType != null">node_type = #{nodeType},</if>
@@ -132,6 +132,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="update" parameterType="FlowNode">
+        update flow_node
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="nodeType != null">node_type = #{nodeType},</if>
+            <if test="definitionId != null">definition_id = #{definitionId},</if>
+            <if test="nodeName != null and nodeName != ''">node_name = #{nodeName},</if>
+            <if test="nodeCode != null and nodeCode != ''">node_code = #{nodeCode},</if>
+            <if test="roleCode != null">role_code = #{roleCode},</if>
+            <if test="roleName != null">role_name = #{roleName},</if>
+            <if test="version != null and version != ''">version = #{version},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+    </update>
+
     <delete id="deleteById" parameterType="Long">
         delete from flow_node where id = #{id}
     </delete>
diff --git a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml
index 89c35a51..2359f977 100644
--- a/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml
+++ b/hh-modules/hh-flow/src/main/resources/mapper/flow/FlowSkipMapper.xml
@@ -79,6 +79,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <update id="updateById" parameterType="FlowSkip">
+        update flow_skip
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="definitionId != null">definition_id = #{definitionId},</if>
+            <if test="nodeId != null">node_id = #{nodeId},</if>
+            <if test="nowNodeCode != null and nowNodeCode != ''">now_node_code = #{nowNodeCode},</if>
+            <if test="nextNodeCode != null and nextNodeCode != ''">next_node_code = #{nextNodeCode},</if>
+            <if test="conditionValue != null">condition_value = #{conditionValue},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <update id="update" parameterType="FlowSkip">
         update flow_skip
         <trim prefix="SET" suffixOverrides=",">
diff --git a/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh b/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
index 9c9e308d..62bfdc88 100644
--- a/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
+++ b/hh-modules/hh-generator/src/main/resources/templates/xml/mapper.xml.ftlh
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.${pkColumn.columnName} = ${r"#"}{${pkColumn.javaField}}
 </#if>
     </select>
-	
+
     <select id="selectByIds" parameterType="${pkColumn.javaType}" resultMap="<#if table.sub>${ClassName}${subClassName}Result<#else>${ClassName}Result</#if>">
 <#if table.crud || table.tree>
         <include refid="selectVo"/>
@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="update" parameterType="${ClassName}">
+    <update id="updateById" parameterType="${ClassName}">
         update ${tableName}
         <trim prefix="SET" suffixOverrides=",">
 <#list columns as column>
@@ -106,6 +106,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where ${pkColumn.columnName} = ${r"#"}{${pkColumn.javaField}}
     </update>
+	
+    <update id="update" parameterType="${ClassName}">
+        update ${tableName}
+        <trim prefix="SET" suffixOverrides=",">
+<#list columns as column>
+<#if column.columnName != pkColumn.columnName>
+            <if test="${column.javaField} != null<#if column.javaType == 'String' && column.required> and ${column.javaField} != ''</#if>">${column.columnName} = ${r"#"}{${column.javaField}},</if>
+</#if>
+</#list>
+        </trim>
+    </update>	
 
     <delete id="deleteById" parameterType="${pkColumn.javaType}">
         delete from ${tableName} where ${pkColumn.columnName} = ${r"#"}{${pkColumn.javaField}}
-- 
Gitee