24282 2 years ago
parent
commit
26c38d4297

+ 6 - 1
hx-flow/src/main/java/com/fjhx/flow/entity/flow/dto/FlowDefinitionSelectDto.java

@@ -7,11 +7,16 @@ import lombok.Setter;
 /**
 /**
  * 流程定义列表查询入参实体
  * 流程定义列表查询入参实体
  *
  *
- * @author 
+ * @author
  * @since 2023-04-03
  * @since 2023-04-03
  */
  */
 @Getter
 @Getter
 @Setter
 @Setter
 public class FlowDefinitionSelectDto extends BaseSelectDto {
 public class FlowDefinitionSelectDto extends BaseSelectDto {
 
 
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
 }
 }

+ 5 - 0
hx-flow/src/main/java/com/fjhx/flow/entity/flow/vo/FlowDefinitionPageVo.java

@@ -43,4 +43,9 @@ public class FlowDefinitionPageVo {
      */
      */
     private Integer versionNumber;
     private Integer versionNumber;
 
 
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
 }
 }

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

@@ -49,7 +49,8 @@ public class FlowDefinitionServiceImpl extends ServiceImpl<FlowDefinitionMapper,
     public Page<FlowDefinitionPageVo> getPage(FlowDefinitionSelectDto dto) {
     public Page<FlowDefinitionPageVo> getPage(FlowDefinitionSelectDto dto) {
         IWrapper<Object> wrapper = IWrapper.getWrapper()
         IWrapper<Object> wrapper = IWrapper.getWrapper()
                 .keyword(dto, new SqlField("fi", FlowInfo::getFlowKey), new SqlField("fi", FlowInfo::getFlowName))
                 .keyword(dto, new SqlField("fi", FlowInfo::getFlowKey), new SqlField("fi", FlowInfo::getFlowName))
-                .eq("fd", FlowDefinition::getCurrentVersion, StatusConstant.YES);
+                .eq("fd", FlowDefinition::getCurrentVersion, StatusConstant.YES)
+                .eq("fd", FlowDefinition::getTenantId, dto.getTenantId());
         return baseMapper.getPage(dto.getPage(), wrapper);
         return baseMapper.getPage(dto.getPage(), wrapper);
     }
     }