Browse Source

优化子流程显示逻辑

hubin 1 year ago
parent
commit
6022556407

+ 3 - 0
src/main/java/com/aizuda/boot/modules/flw/entity/vo/FlwProcessVO.java

@@ -35,6 +35,9 @@ public class FlwProcessVO {
     @Schema(description = "流程定义图标地址")
     private String processIcon;
 
+    @Schema(description = "流程类型")
+    private String processType;
+
     @Schema(description = "流程定义版本")
     private Integer processVersion;
 

+ 3 - 3
src/main/resources/mapper/FlowlongMapper.xml

@@ -4,14 +4,14 @@
 <mapper namespace="com.aizuda.boot.modules.flw.mapper.FlowlongMapper">
 
     <select id="selectFlwProcessList" resultType="com.aizuda.boot.modules.flw.entity.vo.FlwProcessVO">
-        SELECT t2.category_id,t2.process_id,t1.process_key,t1.process_name,t1.process_icon,t1.process_version,t1.instance_url,t1.remark,t1.use_scope,
+        SELECT t2.category_id,t2.process_id,t1.process_key,t1.process_name,t1.process_icon,t1.process_type,t1.process_version,t1.instance_url,t1.remark,t1.use_scope,
                t1.process_state,t1.sort AS process_sort,t1.create_time FROM flw_process t1 JOIN  flw_process_configure t2 ON t1.id=t2.process_id
     </select>
 
     <select id="selectLaunchProcessList" resultType="com.aizuda.boot.modules.flw.entity.vo.FlwProcessVO">
-        WITH tb AS (SELECT t2.category_id,t2.process_id,t1.process_key,t1.process_name,t1.process_icon,t1.process_version,t1.instance_url,
+        WITH tb AS (SELECT t2.category_id,t2.process_id,t1.process_key,t1.process_name,t1.process_icon,t1.process_type,t1.process_version,t1.instance_url,
         t1.remark,t1.use_scope,t1.process_state,t1.sort AS process_sort,t1.create_time
-        FROM flw_process t1 JOIN flw_process_configure t2 ON t1.ID = t2.process_id WHERE t1.process_state=1)
+        FROM flw_process t1 JOIN flw_process_configure t2 ON t1.ID = t2.process_id WHERE t1.process_state=1 AND t1.process_type='main')
         SELECT tb.* FROM tb WHERE NOT EXISTS (SELECT 1 FROM flw_process_actor a WHERE tb.process_id=a.process_id) UNION ALL
         SELECT tb.* FROM tb WHERE EXISTS (SELECT 1 FROM flw_process_actor a JOIN sys_user_role r ON a.actor_id=r.role_id WHERE a.actor_type=0 AND r.user_id=0 AND tb.process_id=a.process_id)
     </select>