From 1885b1445c5ef2f3345367eb4d0162198da8f349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 16 Dec 2024 17:22:16 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FlwDefinitionController.java   |  6 ++-
 .../dromara/workflow/domain/FlowCategory.java |  5 ---
 .../workflow/domain/bo/FlowCategoryBo.java    |  5 ---
 .../workflow/domain/vo/FlowCategoryVo.java    | 10 +----
 .../service/impl/FlwCategoryServiceImpl.java  |  1 -
 .../mapper/workflow/FlwDefMapper.xml          | 16 -------
 .../mapper/workflow/FlwInstanceMapper.xml     | 19 --------
 .../mapper/workflow/FlwTaskMapper.xml         | 43 +------------------
 script/sql/ry_workflow.sql                    |  3 +-
 9 files changed, 8 insertions(+), 100 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
index 092eb0d5a..d43fcefa7 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
@@ -51,10 +51,12 @@ public class FlwDefinitionController extends BaseController {
 
     /**
      * 获取流程分类树列表
+     *
+     * @param categoryBo 参数
      */
     @GetMapping("/categoryTree")
-    public R<List<Tree<Long>>> categoryTree(FlowCategoryBo dept) {
-        return R.ok(flwCategoryService.selectCategoryTreeList(dept));
+    public R<List<Tree<Long>>> categoryTree(FlowCategoryBo categoryBo) {
+        return R.ok(flwCategoryService.selectCategoryTreeList(categoryBo));
     }
 
     /**
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
index d84f3b1ae..50c5049c4 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
@@ -44,11 +44,6 @@ public class FlowCategory extends TenantEntity {
      */
     private String categoryName;
 
-    /**
-     * 流程分类编码
-     */
-    private String categoryCode;
-
     /**
      * 显示顺序
      */
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java
index c1f62f93d..97d221651 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java
@@ -39,11 +39,6 @@ public class FlowCategoryBo extends BaseEntity {
     @NotBlank(message = "流程分类名称不能为空", groups = {AddGroup.class, EditGroup.class})
     private String categoryName;
 
-    /**
-     * 流程分类编码
-     */
-    private String categoryCode;
-
     /**
      * 显示顺序
      */
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
index 45e29a985..120f4cc02 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
@@ -34,12 +34,12 @@ public class FlowCategoryVo implements Serializable {
     private Long categoryId;
 
     /**
-     * 父部门id
+     * 父级id
      */
     private Long parentId;
 
     /**
-     * 父部门名称
+     * 父类别名称
      */
     private String parentName;
 
@@ -54,12 +54,6 @@ public class FlowCategoryVo implements Serializable {
     @ExcelProperty(value = "流程分类名称")
     private String categoryName;
 
-    /**
-     * 流程分类编码
-     */
-    @ExcelProperty(value = "流程分类编码")
-    private String categoryCode;
-
     /**
      * 显示顺序
      */
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
index 4d2c41749..7333d486d 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
@@ -194,7 +194,6 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService {
         lqw.eq(ObjectUtil.isNotNull(bo.getCategoryId()), FlowCategory::getCategoryId, bo.getCategoryId());
         lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), FlowCategory::getParentId, bo.getParentId());
         lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), FlowCategory::getCategoryName, bo.getCategoryName());
-        lqw.like(StringUtils.isNotBlank(bo.getCategoryCode()), FlowCategory::getCategoryCode, bo.getCategoryCode());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), FlowCategory::getStatus, bo.getStatus());
         lqw.orderByAsc(FlowCategory::getAncestors);
         lqw.orderByAsc(FlowCategory::getParentId);
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
index 98511f187..d5204717c 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml
@@ -4,22 +4,6 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.workflow.mapper.FlwDefMapper">
     <resultMap type="org.dromara.workflow.domain.vo.FlowDefinitionVo" id="FlowDefinitionResult">
-        <result property="id" column="id"/>
-        <result property="flowCode" column="flow_code"/>
-        <result property="flowName" column="flow_name"/>
-        <result property="category" column="category"/>
-        <result property="version" column="version"/>
-        <result property="isPublish" column="is_publish"/>
-        <result property="formCustom" column="form_custom"/>
-        <result property="formPath" column="form_path"/>
-        <result property="activityStatus" column="activity_status"/>
-        <result property="listenerType" column="listener_type"/>
-        <result property="listenerPath" column="listener_path"/>
-        <result property="ext" column="ext"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
     <select id="selectDefinitionList" resultMap="FlowDefinitionResult">
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml
index 003823e8a..dc6d57ed2 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml
@@ -4,25 +4,6 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.workflow.mapper.FlwInstanceMapper">
     <resultMap type="org.dromara.workflow.domain.vo.FlowInstanceVo" id="FlowInstanceResult">
-        <result property="id" column="id"/>
-        <result property="nodeCode" column="node_code"/>
-        <result property="nodeName" column="node_name"/>
-        <result property="nodeType" column="node_type"/>
-        <result property="definitionId" column="definition_id"/>
-        <result property="flowStatus" column="flow_status"/>
-        <result property="activityStatus" column="activity_status"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="tenantId" column="tenant_id"/>
-        <result property="businessId" column="business_id"/>
-        <result property="flowName" column="flow_name"/>
-        <result property="flowCode" column="flow_code"/>
-        <result property="formCustom" column="form_custom"/>
-        <result property="formPath" column="form_path"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="ext" column="ext"/>
-        <result property="createBy" column="create_by"/>
-        <result property="category" column="category"/>
     </resultMap>
 
     <select id="selectInstanceList" resultMap="FlowInstanceResult">
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
index 28537990f..55e84a823 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
@@ -4,49 +4,8 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.workflow.mapper.FlwTaskMapper">
     <resultMap type="org.dromara.workflow.domain.vo.FlowTaskVo" id="FlowTaskResult">
-        <result property="id" column="id"/>
-        <result property="nodeCode" column="node_code"/>
-        <result property="nodeName" column="node_name"/>
-        <result property="nodeType" column="node_type"/>
-        <result property="definitionId" column="definition_id"/>
-        <result property="instanceId" column="instance_id"/>
-        <result property="flowStatus" column="flow_status"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="tenantId" column="tenant_id"/>
-        <result property="businessId" column="business_id"/>
-        <result property="flowName" column="flow_name"/>
-        <result property="flowCode" column="flow_code"/>
-        <result property="formCustom" column="form_custom"/>
-        <result property="formPath" column="form_path"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="type" column="type"/>
-        <result property="createBy" column="create_by"/>
     </resultMap>
     <resultMap type="org.dromara.workflow.domain.vo.FlowHisTaskVo" id="FlowHisTaskResult">
-        <result property="id" column="id"/>
-        <result property="nodeCode" column="node_code"/>
-        <result property="nodeName" column="node_name"/>
-        <result property="nodeType" column="node_type"/>
-        <result property="targetNodeCode" column="target_node_code"/>
-        <result property="targetNodeName" column="target_node_name"/>
-        <result property="approver" column="approver"/>
-        <result property="collaborator" column="collaborator"/>
-        <result property="definitionId" column="definition_id"/>
-        <result property="instanceId" column="instance_id"/>
-        <result property="taskId" column="task_id"/>
-        <result property="cooperateType" column="cooperate_type"/>
-        <result property="flowStatus" column="flow_status"/>
-        <result property="message" column="message"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="businessId" column="business_id"/>
-        <result property="nodeName" column="node_name"/>
-        <result property="tenantId" column="tenant_id"/>
-        <result property="flowName" column="flow_name"/>
-        <result property="flowCode" column="flow_code"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="formPath" column="form_path"/>
     </resultMap>
 
     <select id="getTaskWaitByPage" resultMap="FlowTaskResult">
@@ -66,7 +25,7 @@
                 d.flow_name,
                 d.flow_code,
                 d.form_custom,
-                COALESCE(t.form_path, d.form_path),
+                COALESCE(t.form_path, d.form_path) as form_path,
                 d.version,
                 uu.processed_by,
                 uu.type,
diff --git a/script/sql/ry_workflow.sql b/script/sql/ry_workflow.sql
index 93ccecc09..7af6847fd 100644
--- a/script/sql/ry_workflow.sql
+++ b/script/sql/ry_workflow.sql
@@ -156,7 +156,6 @@ create table flow_category
     parent_id     bigint(20)   default 0 comment '父流程分类id',
     ancestors     varchar(500) default '' comment '祖级列表',
     category_name varchar(30) not null comment '流程分类名称',
-    category_code varchar(100) default '' comment '流程分类编码',
     order_num     int(4)       default 0 comment '显示顺序',
     status        char(1)      default '0' comment '流程分类状态（0正常 1停用）',
     del_flag      char(1)      default '0' comment '删除标志（0代表存在 2代表删除）',
@@ -168,7 +167,7 @@ create table flow_category
     primary key (category_id)
 ) engine = innodb comment = '流程分类';
 
-INSERT INTO flow_category values (1, '000000', 0, '0', 'OA', 'OA', 0, '0', '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (1, '000000', 0, '0', 'OA', 0, '0', '0', 103, 1, sysdate(), null, null);
 
 -- ----------------------------
 -- 请假单信息