diff --git a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flow/core/entity/BladeFlow.java b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flow/core/entity/BladeFlow.java index 380f54c6..04928440 100644 --- a/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flow/core/entity/BladeFlow.java +++ b/blade-ops-api/blade-flow-api/src/main/java/org/springblade/flow/core/entity/BladeFlow.java @@ -120,6 +120,10 @@ public class BladeFlow implements Serializable { * 流程实例是否结束 */ private String processIsFinished; + /** + * 历史活动ID + */ + private String historyActivityId; /** * 历史活动流程 */ diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java index 1aa31c37..5585aafe 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java @@ -178,6 +178,7 @@ public class FlowEngineServiceImpl extends ServiceImpl im activityMap.put(historicActivityInstance.getActivityId(), activityMap.size()); } BladeFlow flow = new BladeFlow(); + flow.setHistoryActivityId(historicActivityInstance.getActivityId()); flow.setHistoryActivityName(historicActivityInstance.getActivityName()); flow.setCreateTime(historicActivityInstance.getStartTime()); flow.setEndTime(historicActivityInstance.getEndTime()); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java index 912ceeb2..2a0d4015 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java @@ -58,13 +58,14 @@ import static org.springblade.core.cache.constant.CacheConstant.MENU_CACHE; @AllArgsConstructor public class MenuServiceImpl extends ServiceImpl implements IMenuService { - private IRoleMenuService roleMenuService; - private IRoleScopeService roleScopeService; - private ITopMenuSettingService topMenuSettingService; + private final IRoleMenuService roleMenuService; + private final IRoleScopeService roleScopeService; + private final ITopMenuSettingService topMenuSettingService; + private final static String PARENT_ID = "parentId"; @Override public List lazyList(Long parentId, Map param) { - if (Func.isEmpty(Func.toStr(param.get("parentId")))) { + if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) { parentId = null; } return baseMapper.lazyList(parentId, param); @@ -72,7 +73,7 @@ public class MenuServiceImpl extends ServiceImpl implements IM @Override public List lazyMenuList(Long parentId, Map param) { - if (Func.isEmpty(Func.toStr(param.get("parentId")))) { + if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) { parentId = null; } return baseMapper.lazyMenuList(parentId, param);