⚡ 增加已办结的跟踪按钮

blade-ops/blade-flow/src/main/java/org/springblade/flowable/business/service/impl/FlowBusinessServiceImpl.java

@@ -53,17 +53,22 @@ public class FlowBusinessServiceImpl implements FlowBusinessService {
 	@Override
 	public IPage<BladeFlow> selectClaimPage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
 		String taskUser = String.valueOf(SecureUtil.getUserAccount());
+		String taskRole = String.valueOf(SecureUtil.getUserRole());
 		List<BladeFlow> flowList = new LinkedList<>();
 
 		// 等待签收的任务
-		TaskQuery claimQuery = taskService.createTaskQuery().taskCandidateUser(taskUser)
+		TaskQuery claimUserQuery = taskService.createTaskQuery().taskCandidateUser(taskUser)
+			.includeProcessVariables().active().orderByTaskCreateTime().desc();
+		// 等待签收的任务
+		TaskQuery claimRoleQuery = taskService.createTaskQuery().taskCandidateGroup(taskRole)
 			.includeProcessVariables().active().orderByTaskCreateTime().desc();
 
 		// 构建列表数据
-		buildFlowTaskList(bladeFlow, flowList, claimQuery, FlowConstant.STATUS_CLAIM);
+		buildFlowTaskList(bladeFlow, flowList, claimUserQuery, FlowConstant.STATUS_CLAIM);
+		buildFlowTaskList(bladeFlow, flowList, claimRoleQuery, FlowConstant.STATUS_CLAIM);
 
 		// 计算总数
-		long count = claimQuery.count();
+		long count = claimUserQuery.count() + claimRoleQuery.count();
 		// 设置页数
 		page.setSize(count);
 		// 设置总数

doc/sql/bladex-update-RC9.sql

@@ -84,6 +84,8 @@ VALUES (@workid, 'work_done', '办结事务', 'menu', '/work/done', NULL, 4, 1,
 set @doneid = (SELECT LAST_INSERT_ID());
 INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
 VALUES (@doneid, 'work_done_detail', '详情', 'detail', '', 'detail', 1, 2, 2, 1, NULL, 0);
+INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES (@sendid, 'work_done_follow', '跟踪', 'follow', '', 'follow', 2, 2, 2, 1, NULL, 0);
 
 -- ----------------------------
 -- 更新系统管理排序