流程优化

hx-flow/src/main/java/com/fjhx/flow/entity/flow/dto/FlowInfoSelectDto.java

@@ -19,4 +19,11 @@ public class FlowInfoSelectDto extends BaseSelectDto {
      */
     private String classifyName;
 
+    /**
+     * 流程状态
+     * 1启用
+     * 0禁用
+     */
+    private Integer status;
+
 }

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowDefinitionServiceImpl.java

@@ -47,10 +47,17 @@ public class FlowDefinitionServiceImpl extends ServiceImpl<FlowDefinitionMapper,
 
     @Override
     public Page<FlowDefinitionPageVo> getPage(FlowDefinitionSelectDto dto) {
+
+        List<Long> flowInfoIdList = flowInfoService.listObject(BaseIdPo::getId, q -> q.eq(FlowInfo::getStatus, StatusConstant.ENABLE));
+        if (flowInfoIdList.size() == 0) {
+            return new Page<>();
+        }
+
         IWrapper<Object> wrapper = IWrapper.getWrapper()
                 .keyword(dto, new SqlField("fi", FlowInfo::getFlowKey), new SqlField("fi", FlowInfo::getFlowName))
                 .eq("fd", FlowDefinition::getCurrentVersion, StatusConstant.YES)
-                .eq("fd", FlowDefinition::getTenantId, dto.getTenantId());
+                .eq("fd", FlowDefinition::getTenantId, dto.getTenantId())
+                .in("fd", FlowDefinition::getFlowInfoId, flowInfoIdList);
         return baseMapper.getPage(dto.getPage(), wrapper);
     }
 

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowInfoServiceImpl.java

@@ -29,6 +29,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
 
         IWrapper<FlowInfo> wrapper = getWrapper();
         wrapper.eq("fi", FlowInfo::getClassifyName, dto.getClassifyName());
+        wrapper.eq("fi", FlowInfo::getStatus, dto.getStatus());
         wrapper.keyword(dto, new SqlField("fi", FlowInfo::getFlowName), new SqlField("fi", FlowInfo::getFlowKey));
         wrapper.orderByDesc("fi", FlowInfo::getId);