diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 875e51b93..48bb04089 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -7,11 +7,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.warm.flow.core.entity.*; +import com.warm.flow.core.entity.Instance; import com.warm.flow.core.enums.CooperateType; import com.warm.flow.core.enums.FlowStatus; import com.warm.flow.core.enums.NodeType; -import com.warm.flow.core.service.*; +import com.warm.flow.core.service.DefService; +import com.warm.flow.core.service.InsService; import com.warm.flow.orm.entity.FlowDefinition; import com.warm.flow.orm.entity.FlowHisTask; import com.warm.flow.orm.entity.FlowInstance; @@ -20,7 +21,7 @@ import com.warm.flow.orm.mapper.FlowHisTaskMapper; import com.warm.flow.orm.mapper.FlowInstanceMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.UserConstants; +import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -68,7 +69,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { public TableDataInfo getPageByRunning(Instance instance, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("t.flow_status", FlowStatus.APPROVAL.getKey()); - queryWrapper.eq("t.del_flag", UserConstants.USER_NORMAL); + queryWrapper.eq("t.del_flag", SystemConstants.NORMAL); Page page = flwInstanceMapper.page(pageQuery.build(), queryWrapper); TableDataInfo build = TableDataInfo.build(); build.setRows(BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class));