⚡ 优化功能

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;
 	/**
 	 * 历史活动流程
 	 */

blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java

@@ -178,6 +178,7 @@ public class FlowEngineServiceImpl extends ServiceImpl<FlowMapper, FlowModel> 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());

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<MenuMapper, Menu> 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<MenuVO> lazyList(Long parentId, Map<String, Object> 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<MenuMapper, Menu> implements IM
 
 	@Override
 	public List<MenuVO> lazyMenuList(Long parentId, Map<String, Object> 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);